receive-pack: do not reuse old_sha1[] for other things
This piece of code reads object names of shallow boundaries, not old_sha1[], i.e. the current value the ref points at, which is to be replaced by what is in new_sha1[]. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 15, 2014 at 14:26 UTC
c09b71ccc45f4be3acca5e809a18a000cae09faf
1 file changed
+5
-3
builtin/receive-pack.c
+5
-3
@@ -847,9 +847,11 @@ static struct command *read_head_info(struct sha1_array *shallow)
847
break;
848
849
if (len == 48 && starts_with(line, "shallow ")) {
850
- if (get_sha1_hex(line + 8, old_sha1))
851
- die("protocol error: expected shallow sha, got '%s'", line + 8);
852
- sha1_array_append(shallow, old_sha1);
850
+ unsigned char sha1[20];
851
+ if (get_sha1_hex(line + 8, sha1))
852
+ die("protocol error: expected shallow sha, got '%s'",
853
+ line + 8);
854
+ sha1_array_append(shallow, sha1);
855
continue;
856
}
857