Code

count-delta.c: Match the delta data semantics change in version 3.
authorJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 01:15:59 +0000 (17:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 05:06:38 +0000 (21:06 -0800)
This matches the count_delta() logic to the change previous
commit introduces to patch_delta().

Signed-off-by: Junio C Hamano <junkio@cox.net>
count-delta.c

index 7559ff68b10925154af3d52b8134f47fcf7c5233..978a60ca9d7afb05cdfd8ad68108d89a64add7fd 100644 (file)
@@ -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 & 0x40) cp_size |= (*data++ << 16);
                        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 */