[PATCH v3 4/9] t5520: test for failure if index has unresolved entries
flat view
STALE3765d
From: Paul Tan <hidden>
Date: 2016-06-15 23:04:45
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v3 of 5 in this series.
Revisions (5)
Commit d38a30d (Be more user-friendly when refusing to do something because of conflict., 2010-01-12) introduced code paths to git-pull which will error out with user-friendly advices if the user is in the middle of a merge or has unmerged files. Implement tests to ensure that git-pull will not run, and will print these advices, if the user is in the middle of a merge or has unmerged files in the index. Signed-off-by: Paul Tan <redacted> --- * Command substitution is now quoted. t/t5520-pull.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index e53d8e9..8e95402 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh@@ -164,6 +164,26 @@ test_expect_success 'fail if upstream branch does not exist' ' verbose test "$(cat file)" = file ' +test_expect_success 'fail if the index has unresolved entries' ' + git checkout -b third second^ && + test_when_finished "git checkout -f copy && git branch -D third" && + verbose test "$(cat file)" = file && + echo modified2 >file && + git commit -a -m modified2 && + verbose test -z "$(git ls-files -u)" && + test_must_fail git pull . second && + verbose test -n "$(git ls-files -u)" && + cp file expected && + test_must_fail git pull . second 2>err && + test_i18ngrep "you have unmerged files" err && + test_cmp expected file && + git add file && + verbose test -z "$(git ls-files -u)" && + test_must_fail git pull . second 2>err && + test_i18ngrep "have not concluded your merge" err && + test_cmp expected file +' + test_expect_success '--rebase' ' git branch to-rebase && echo modified again > file &&
--
2.1.4