From 91c7674371c101766242b52ea1880cd919cb3075 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 9 Feb 2006 17:15:59 -0800 Subject: [PATCH] count-delta.c: Match the delta data semantics change in version 3. This matches the count_delta() logic to the change previous commit introduces to patch_delta(). Signed-off-by: Junio C Hamano --- count-delta.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/count-delta.c b/count-delta.c index 7559ff68b..978a60ca9 100644 --- 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 & 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 */ -- 2.26.2