Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
ec7e680c
Commit
ec7e680c
authored
Nov 20, 2014
by
Ravindra Patel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for misleading "missing delta bases" error - Fix #2721.
parent
7561f98d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
src/indexer.c
+3
-2
src/pack.c
+4
-1
No files found.
src/indexer.c
View file @
ec7e680c
...
...
@@ -671,8 +671,10 @@ static int inject_object(git_indexer *idx, git_oid *id)
seek_back_trailer
(
idx
);
entry_start
=
idx
->
pack
->
mwf
.
size
;
if
(
git_odb_read
(
&
obj
,
idx
->
odb
,
id
)
<
0
)
if
(
git_odb_read
(
&
obj
,
idx
->
odb
,
id
)
<
0
)
{
giterr_set
(
GITERR_INDEXER
,
"missing delta bases"
);
return
-
1
;
}
data
=
git_odb_object_data
(
obj
);
len
=
git_odb_object_size
(
obj
);
...
...
@@ -827,7 +829,6 @@ static int resolve_deltas(git_indexer *idx, git_transfer_progress *stats)
break
;
if
(
!
progressed
&&
(
fix_thin_pack
(
idx
,
stats
)
<
0
))
{
giterr_set
(
GITERR_INDEXER
,
"missing delta bases"
);
return
-
1
;
}
}
...
...
src/pack.c
View file @
ec7e680c
...
...
@@ -408,11 +408,14 @@ static int packfile_unpack_header1(
size
=
c
&
15
;
shift
=
4
;
while
(
c
&
0x80
)
{
if
(
len
<=
used
)
if
(
len
<=
used
)
{
giterr_set
(
GITERR_ODB
,
"buffer too small"
);
return
GIT_EBUFS
;
}
if
(
bitsizeof
(
long
)
<=
shift
)
{
*
usedp
=
0
;
giterr_set
(
GITERR_ODB
,
"packfile corrupted"
);
return
-
1
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment