diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-01-08 10:12:40 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-09 23:34:10 -0800 |
| commit | 1945237486851bc3a0c6d65eaeb21cb22cac2ea1 (patch) | |
| tree | f0707fe3dc249ab2fc2b74cd9ab1cd6e0c593e7f /t/t5541-http-push.sh | |
| parent | c2ff10c98e22ae64d553273e6d67bb123a1c916f (diff) | |
| download | git-1945237486851bc3a0c6d65eaeb21cb22cac2ea1.tar.gz git-1945237486851bc3a0c6d65eaeb21cb22cac2ea1.tar.xz | |
t5541-http-push.sh: add tests for non-fast-forward pushes
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 | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index 2a58d0cc9..f49c7c417 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -88,5 +88,28 @@ test_expect_success 'used receive-pack service' ' test_cmp exp act ' +test_expect_success 'non-fast-forward push fails' ' + cd "$ROOT_PATH"/test_repo_clone && + git checkout master && + echo "changed" > path2 && + git commit -a -m path2 --amend && + + HEAD=$(git rev-parse --verify HEAD) && + !(git push -v origin >output 2>&1) && + (cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git && + test $HEAD != $(git rev-parse --verify HEAD)) +' + +test_expect_failure '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' ' + 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'"' +section of '"'git push --help'"' for details." output +' + stop_httpd test_done |