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> --- t/t5520-pull.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 635ec02..9f57e0d 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -174,6 +174,21 @@ test_expect_success 'fail if wildcard spec does not match any refs' " test_i18ngrep 'There are no candidates for merging' out " +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_must_fail git pull . second && + test_must_fail git pull . second 2>out && + test_i18ngrep "Pull is not possible because you have unmerged files" out && + git add file && + test_must_fail git pull . second 2>out && + test_i18ngrep "You have not concluded your merge" out +' + 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