X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=send-pack.c;h=2a14b00845c0211a0ddb38dad892ff2be0fdc8cc;hb=99e01692063cc48adee19e1f738472a579c14ca2;hp=55d8ff7e102fa6cc369c993035c0579c2d33b775;hpb=434d6ba03122c160f98713a009cf8a32d02982f3;p=git.git diff --git a/send-pack.c b/send-pack.c index 55d8ff7e..2a14b008 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 */ @@ -273,6 +273,7 @@ int main(int argc, char **argv) int fd[2], ret; pid_t pid; + setup_git_directory(); argv++; for (i = 1; i < argc; i++, argv++) { char *arg = *argv;