X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=send-pack.c;h=3eeb18f7c7d32412003ea665a47081dc06d84c95;hb=3e9fabc85ef44fa0f275dd89738a2dacb7b6f5db;hp=55d8ff7e102fa6cc369c993035c0579c2d33b775;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git diff --git a/send-pack.c b/send-pack.c index 55d8ff7e..3eeb18f7 100644 --- a/send-pack.c +++ b/send-pack.c @@ -126,12 +126,12 @@ static int ref_newer(const unsigned char *new_sha1, /* Both new and old must be commit-ish and new is descendant of * old. Otherwise we require --force. */ - o = deref_tag(parse_object(old_sha1)); + o = deref_tag(parse_object(old_sha1), NULL, 0); if (!o || o->type != commit_type) return 0; old = (struct commit *) o; - o = deref_tag(parse_object(new_sha1)); + o = deref_tag(parse_object(new_sha1), NULL, 0); if (!o || o->type != commit_type) return 0; new = (struct commit *) o; @@ -181,7 +181,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) int new_refs; /* No funny business with the matcher */ - remote_tail = get_remote_heads(in, &remote_refs, 0, NULL); + remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1); get_local_heads(); /* match them up */