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>
Paul Tan committed
May 29, 2015 at 19:44 UTC
05438afca79176f77aff274a624675bb3b9e231e
1 file changed
+19
t/t5520-pull.sh
+19
@@ -164,6 +164,25 @@ test_expect_success 'fail if upstream branch does not exist' '
164
test "$(cat file)" = file
165
'
166
167
+test_expect_success 'fail if the index has unresolved entries' '
168
+ git checkout -b third second^ &&
169
+ test_when_finished "git checkout -f copy && git branch -D third" &&
170
+ test "$(cat file)" = file &&
171
+ test_commit modified2 file &&
172
+ test -z "$(git ls-files -u)" &&
173
+ test_must_fail git pull . second &&
174
+ test -n "$(git ls-files -u)" &&
175
+ cp file expected &&
176
+ test_must_fail git pull . second 2>err &&
177
+ test_i18ngrep "Pull is not possible because you have unmerged files" err &&
178
+ test_cmp expected file &&
179
+ git add file &&
180
+ test -z "$(git ls-files -u)" &&
181
+ test_must_fail git pull . second 2>err &&
182
+ test_i18ngrep "You have not concluded your merge" err &&
183
+ test_cmp expected file
184
+'
185
+
186
test_expect_success '--rebase' '
187
git branch to-rebase &&
188
echo modified again > file &&