diff options
| author |  Tay Ray Chuan <rctay89@gmail.com> | 2010-01-08 10:12:43 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-09 23:34:10 -0800 |
| commit | 4232826771d5bdc4cc0bd21188b6ee5f3e700a52 (patch) | |
| tree | 2e314c980e28f780943de81b8aeb618b77766a24 /t/t5541-http-push.sh | |
| parent | refactor ref status logic for pushing (diff) | |
| download | tgif-4232826771d5bdc4cc0bd21188b6ee5f3e700a52.tar.xz | |
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>
Diffstat (limited to 't/t5541-http-push.sh')
| -rwxr-xr-x | t/t5541-http-push.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index 6d92196d24..979624d0dc 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -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'"' |