Commit d38a30df (Be more user-friendly when refusing to do something
because of conflict) 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 <pyokagan@xxxxxxxxx>
---
Notes:
* Test that on merge conflict, git-pull will not reset conflict status,
or modify the conflicted file.
t/t5520-pull.sh | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 5add900..37ff45f 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -164,6 +164,27 @@ test_expect_success 'fail if upstream branch does not exist' '
test `cat file` = file
'
+test_expect_success 'fail if the index has unresolved entries' '
+ git checkout -b third master^ &&
+ test_when_finished "git checkout -f copy && git branch -D third" &&
+ echo file >expected &&
+ test_cmp expected file &&
+ echo modified2 >file &&
+ git commit -a -m modified2 &&
+ test -z "$(git ls-files -u)" &&
+ test_must_fail git pull . second &&
+ test -n "$(git ls-files -u)" &&
+ cp file expected &&
+ test_must_fail git pull . second 2>out &&
+ test_i18ngrep "Pull is not possible because you have unmerged files" out &&
+ test_cmp expected file &&
+ git add file &&
+ test -z "$(git ls-files -u)" &&
+ test_must_fail git pull . second 2>out &&
+ test_i18ngrep "You have not concluded your merge" out &&
+ test_cmp expected file
+'
+
test_expect_success '--rebase' '
git branch to-rebase &&
echo modified again > file &&
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html