Browse Source

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>
maint
Petr Baudis 19 years ago committed by Junio C Hamano
parent
commit
ed24928e12
  1. 6
      send-pack.c
  2. 10
      t/t5400-send-pack.sh

6
send-pack.c

@ -179,6 +179,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) @@ -179,6 +179,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
{
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);
@ -232,6 +233,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) @@ -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));
ret = -2;
continue;
}

@ -245,12 +247,14 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) @@ -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);
ret = -2;
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++;
@ -267,7 +271,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) @@ -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);
return 0;
return ret;
}



10
t/t5400-send-pack.sh

@ -43,7 +43,15 @@ test_expect_success setup ' @@ -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.
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!

Loading…
Cancel
Save