mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
transport.c::transport_push(): make ref status affect return value
Use push_had_errors() to check the refs for errors and modify the return value. Mark the non-fast-forward push tests to succeed. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
20e8b465a5
commit
4232826771
|
@ -88,7 +88,7 @@ test_expect_success 'used receive-pack service' '
|
|||
test_cmp exp act
|
||||
'
|
||||
|
||||
test_expect_failure 'non-fast-forward push fails' '
|
||||
test_expect_success 'non-fast-forward push fails' '
|
||||
cd "$ROOT_PATH"/test_repo_clone &&
|
||||
git checkout master &&
|
||||
echo "changed" > path2 &&
|
||||
|
@ -104,7 +104,7 @@ test_expect_success 'non-fast-forward push show ref status' '
|
|||
grep "^ ! \[rejected\][ ]*master -> master (non-fast-forward)$" output
|
||||
'
|
||||
|
||||
test_expect_failure 'non-fast-forward push shows help message' '
|
||||
test_expect_success 'non-fast-forward push shows help message' '
|
||||
grep \
|
||||
"To prevent you from losing history, non-fast-forward updates were rejected
|
||||
Merge the remote changes before pushing again. See the '"'non-fast-forward'"'
|
||||
|
|
|
@ -875,7 +875,7 @@ int transport_push(struct transport *transport,
|
|||
int verbose = flags & TRANSPORT_PUSH_VERBOSE;
|
||||
int quiet = flags & TRANSPORT_PUSH_QUIET;
|
||||
int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
|
||||
int ret;
|
||||
int ret, err;
|
||||
|
||||
if (flags & TRANSPORT_PUSH_ALL)
|
||||
match_flags |= MATCH_REFS_ALL;
|
||||
|
@ -892,8 +892,11 @@ int transport_push(struct transport *transport,
|
|||
flags & TRANSPORT_PUSH_FORCE);
|
||||
|
||||
ret = transport->push_refs(transport, remote_refs, flags);
|
||||
err = push_had_errors(remote_refs);
|
||||
|
||||
if (!quiet || push_had_errors(remote_refs))
|
||||
ret |= err;
|
||||
|
||||
if (!quiet || err)
|
||||
print_push_status(transport->url, remote_refs,
|
||||
verbose | porcelain, porcelain,
|
||||
nonfastforward);
|
||||
|
|
Loading…
Reference in a new issue