Make git-send-pack exit with error when some refs couldn't be pushed out

In case some refs couldn't be pushed out due to an error (mostly the
not-a-proper-subset error), make git-send-pack exit with non-zero status
after the push is over (that is, it still tries to push out the rest
of the refs).

[jc: I adjusted a test for this change.]

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/send-pack.c b/send-pack.c
index f61c15c820facf936856c0af6be52a266b7e3dfd..6ce0d9f7884e34c9dc6c90f98bc9f7745c07e12a 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -179,6 +179,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
 {
        struct ref *ref;
        int new_refs;
 {
        struct ref *ref;
        int new_refs;

+       int ret = 0;

 
        /* No funny business with the matcher */
        remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1);
 
        /* No funny business with the matcher */
        remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1);


@@ -232,6 +233,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
                                error("remote '%s' object %s does not "
                                      "exist on local",
                                      ref->name, sha1_to_hex(ref->old_sha1));
                                error("remote '%s' object %s does not "
                                      "exist on local",
                                      ref->name, sha1_to_hex(ref->old_sha1));

+                               ret = -2;

                                continue;
                        }
 
                                continue;
                        }
 


@@ -245,12 +247,14 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
                                error("remote ref '%s' is not a strict "
                                      "subset of local ref '%s'.", ref->name,
                                      ref->peer_ref->name);
                                error("remote ref '%s' is not a strict "
                                      "subset of local ref '%s'.", ref->name,
                                      ref->peer_ref->name);

+                               ret = -2;

                                continue;
                        }
                }
                memcpy(ref->new_sha1, ref->peer_ref->new_sha1, 20);
                if (is_zero_sha1(ref->new_sha1)) {
                        error("cannot happen anymore");
                                continue;
                        }
                }
                memcpy(ref->new_sha1, ref->peer_ref->new_sha1, 20);
                if (is_zero_sha1(ref->new_sha1)) {
                        error("cannot happen anymore");

+                       ret = -3;

                        continue;
                }
                new_refs++;
                        continue;
                }
                new_refs++;


@@ -267,7 +271,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
        if (new_refs)
                pack_objects(out, remote_refs);
        close(out);
        if (new_refs)
                pack_objects(out, remote_refs);
        close(out);

-       return 0;
+       return ret;

 }
 
 
 }
 
 

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 7fc3bd7d3e9c7761a1c64073be95129d3e93bae8..f3694ac3c78e64b6b77ebfef4cb3e90f9fb6c32c 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -43,7 +43,15 @@ test_expect_success setup '
 test_expect_success \
         'pushing rewound head should not barf but require --force' ' 
        # should not fail but refuse to update.
 test_expect_success \
         'pushing rewound head should not barf but require --force' ' 
        # should not fail but refuse to update.

-       git-send-pack ./victim/.git/ master &&
+       if git-send-pack ./victim/.git/ master
+       then
+               # now it should fail with Pasky patch
+               echo >&2 Gaah, it should have failed.
+               false
+       else
+               echo >&2 Thanks, it correctly failed.
+               true
+       fi &&

        if cmp victim/.git/refs/heads/master .git/refs/heads/master
        then
                # should have been left as it was!
        if cmp victim/.git/refs/heads/master .git/refs/heads/master
        then
                # should have been left as it was!