undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

receive-pack: do not reuse old_sha1[] for other things

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2014-08-15 14:26:17 -07:00
parent 0e3c339bb6
commit c09b71ccc4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/receive-pack.c
View File

@ -847,9 +847,11 @@ static struct command *read_head_info(struct sha1_array *shallow)
break;
if (len == 48 && starts_with(line, "shallow ")) {
if (get_sha1_hex(line + 8, old_sha1))
die("protocol error: expected shallow sha, got '%s'", line + 8);
sha1_array_append(shallow, old_sha1);
unsigned char sha1[20];
if (get_sha1_hex(line + 8, sha1))
die("protocol error: expected shallow sha, got '%s'",
line + 8);
sha1_array_append(shallow, sha1);
continue;
}