archimport: fix a in new changeset applyer addition

[git.git] / send-pack.c

diff --git a/send-pack.c b/send-pack.c
index 9f9a6e7..f61c15c 100644 (file)
--- 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;
@@ -190,6 +190,12 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
        if (match_refs(local_refs, remote_refs, &remote_tail,
                       nr_refspec, refspec, send_all))
                return -1;
+
+       if (!remote_refs) {
+               fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
+               return 0;
+       }
+
        /*
         * Finally, tell the other end!
         */
@@ -273,6 +279,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;