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

remote-curl: pass ref SHA-1 to fetch-pack as well

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2013-12-05 20:02:49 +07:00 committed by Junio C Hamano
parent b016918b2f
commit 58f2ed051f
2 changed files with 9 additions and 1 deletions

7
builtin/fetch-pack.c
View File

@ -13,6 +13,13 @@ static void add_sought_entry_mem(struct ref ***sought, int *nr, int *alloc,
const char *name, int namelen) const char *name, int namelen)
{ {
struct ref *ref = xcalloc(1, sizeof(*ref) + namelen + 1); struct ref *ref = xcalloc(1, sizeof(*ref) + namelen + 1);
unsigned char sha1[20];
if (namelen > 41 && name[40] == ' ' && !get_sha1_hex(name, sha1)) {
hashcpy(ref->old_sha1, sha1);
name += 41;
namelen -= 41;
}
memcpy(ref->name, name, namelen); memcpy(ref->name, name, namelen);
ref->name[namelen] = '\0'; ref->name[namelen] = '\0';

3
remote-curl.c
View File

@ -719,7 +719,8 @@ static int fetch_git(struct discovery *heads,
struct ref *ref = to_fetch[i]; struct ref *ref = to_fetch[i];
if (!ref->name || !*ref->name) if (!ref->name || !*ref->name)
die("cannot fetch by sha1 over smart http"); die("cannot fetch by sha1 over smart http");
packet_buf_write(&preamble, "%s\n", ref->name); packet_buf_write(&preamble, "%s %s\n",
sha1_to_hex(ref->old_sha1), ref->name);
} }
packet_buf_flush(&preamble); packet_buf_flush(&preamble);