diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
| commit | c208e05bd9880028c980fafbc5dda3d17a603ac1 (patch) | |
| tree | 25d587aacf885345b2b001bc006ac3871b5c7a4b /t | |
| parent | Merge branch 'nd/maint-fix-replace' (diff) | |
| parent | t7609-merge-co-error-msgs: test non-fast forward case too. (diff) | |
| download | tgif-c208e05bd9880028c980fafbc5dda3d17a603ac1.tar.xz | |
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages:
t7609-merge-co-error-msgs: test non-fast forward case too.
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
setup_unpack_trees_porcelain: take the whole options struct as parameter
Move set_porcelain_error_msgs to unpack-trees.c and rename it
Conflicts:
merge-recursive.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7609-merge-co-error-msgs.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh index 1a109b41dc..114d2bd785 100755 --- a/t/t7609-merge-co-error-msgs.sh +++ b/t/t7609-merge-co-error-msgs.sh @@ -34,9 +34,17 @@ error: The following untracked working tree files would be overwritten by merge: Please move or remove them before you can merge. EOF -test_expect_success 'untracked files overwritten by merge' ' +test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' ' test_must_fail git merge branch 2>out && - test_cmp out expect + test_cmp out expect && + git commit --allow-empty -m empty && + ( + GIT_MERGE_VERBOSITY=0 && + export GIT_MERGE_VERBOSITY && + test_must_fail git merge branch 2>out2 + ) && + test_cmp out2 expect && + git reset --hard HEAD^ ' cat >expect <<\EOF |