projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
count-delta.c: Match the delta data semantics change in version 3.
[git.git]
/
count-delta.c
diff --git
a/count-delta.c
b/count-delta.c
index
7559ff6
..
978a60c
100644
(file)
--- a/
count-delta.c
+++ b/
count-delta.c
@@
-50,13
+50,10
@@
int count_delta(void *delta_buf, unsigned long delta_size,
if (cmd & 0x08) cp_off |= (*data++ << 24);
if (cmd & 0x10) cp_size = *data++;
if (cmd & 0x20) cp_size |= (*data++ << 8);
if (cmd & 0x08) cp_off |= (*data++ << 24);
if (cmd & 0x10) cp_size = *data++;
if (cmd & 0x20) cp_size |= (*data++ << 8);
+ if (cmd & 0x40) cp_size |= (*data++ << 16);
if (cp_size == 0) cp_size = 0x10000;
if (cp_size == 0) cp_size = 0x10000;
- if (cmd & 0x40)
- /* copy from dst */
- ;
- else
- copied_from_source += cp_size;
+ copied_from_source += cp_size;
out += cp_size;
} else {
/* write literal into dst */
out += cp_size;
} else {
/* write literal into dst */