diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-05-29 13:44:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-29 18:14:52 +0200 |
| commit | 05438afca79176f77aff274a624675bb3b9e231e (patch) | |
| tree | 9bf75c1b847b8610ea57a45d06f2b05497168175 /t | |
| parent | t5520: test no merge candidates cases (diff) | |
| download | git-05438afca79176f77aff274a624675bb3b9e231e.tar.xz git-05438afca79176f77aff274a624675bb3b9e231e.zip | |
t5520: test for failure if index has unresolved entries
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 <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5520-pull.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 4a2c0a1f26..265c693b51 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -164,6 +164,25 @@ 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 second^ && + test_when_finished "git checkout -f copy && git branch -D third" && + test "$(cat file)" = file && + test_commit modified2 file && + 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>err && + test_i18ngrep "Pull is not possible because you have unmerged files" err && + test_cmp expected file && + git add file && + test -z "$(git ls-files -u)" && + test_must_fail git pull . second 2>err && + test_i18ngrep "You have not concluded your merge" err && + test_cmp expected file +' + test_expect_success '--rebase' ' git branch to-rebase && echo modified again > file && |