summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-06-21 21:14:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-21 21:14:09 -0700
commit44fb185963d42bb1dd6f1b3ea690d2a8f3c4edbc (patch)
treee416edac27adfd1cf790f2aaa493b0e61a26d10f /sha1_file.c
parentMerge branch 'pb/maint-1.6.2-userdiff-fix' into maint (diff)
parentFix big left-shifts of unsigned char (diff)
downloadtgif-44fb185963d42bb1dd6f1b3ea690d2a8f3c4edbc.tar.xz
Merge branch 'lt/maint-unsigned-left-shift' into maint
* lt/maint-unsigned-left-shift: Fix big left-shifts of unsigned char
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c
index e73cd4fc0b..8f5fe62d54 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1162,8 +1162,7 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,
unsigned long len, enum object_type *type, unsigned long *sizep)
{
unsigned shift;
- unsigned char c;
- unsigned long size;
+ unsigned long size, c;
unsigned long used = 0;
c = buf[used++];