undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Petr Baudis 2005-12-14 01:45:40 +01:00 committed by Junio C Hamano
parent 9954f5b876
commit ed24928e12
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
send-pack.c
View File

@ -179,6 +179,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
{ {
struct ref *ref; struct ref *ref;
int new_refs; int new_refs;
int ret = 0;
/* No funny business with the matcher */ /* No funny business with the matcher */
remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1); 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 " error("remote '%s' object %s does not "
"exist on local", "exist on local",
ref->name, sha1_to_hex(ref->old_sha1)); 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 " error("remote ref '%s' is not a strict "
"subset of local ref '%s'.", ref->name, "subset of local ref '%s'.", ref->name,
ref->peer_ref->name); ref->peer_ref->name);
ret = -2;
continue; continue;
} }
} }
memcpy(ref->new_sha1, ref->peer_ref->new_sha1, 20); memcpy(ref->new_sha1, ref->peer_ref->new_sha1, 20);
if (is_zero_sha1(ref->new_sha1)) { if (is_zero_sha1(ref->new_sha1)) {
error("cannot happen anymore"); error("cannot happen anymore");
ret = -3;
continue; continue;
} }
new_refs++; new_refs++;
@ -267,7 +271,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
if (new_refs) if (new_refs)
pack_objects(out, remote_refs); pack_objects(out, remote_refs);
close(out); close(out);
return 0; return ret;
} }

10
t/t5400-send-pack.sh
View File

@ -43,7 +43,15 @@ test_expect_success setup '
test_expect_success \ test_expect_success \
'pushing rewound head should not barf but require --force' ' 'pushing rewound head should not barf but require --force' '
# should not fail but refuse to update. # 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 if cmp victim/.git/refs/heads/master .git/refs/heads/master
then then
# should have been left as it was! # should have been left as it was!