diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-24 10:55:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 10:55:24 -0700 |
| commit | 15dc5b5fb049bdf7abdbc610a5dec040c4d499bd (patch) | |
| tree | c787e85448802c968c62cd1b99f162174cb86c17 /t | |
| parent | Git 2.5.0-rc3 (diff) | |
| download | tgif-15dc5b5fb049bdf7abdbc610a5dec040c4d499bd.tar.xz | |
Revert "git-am: add am.threeWay config variable"
This reverts commit d96a275b91bae1800cd43be0651e886e7e042a17.
It used to be possible to apply a patch series with "git am mbox"
and then only after seeing a failure, switch to three-way mode via
"git am -3" (no other options or arguments). The commit being
reverted broke this workflow.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4150-am.sh | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index b822a3918d..6ced98cfb4 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -303,25 +303,6 @@ test_expect_success 'am -3 -p0 can read --no-prefix patch' ' git diff --exit-code lorem ' -test_expect_success 'am with config am.threeWay falls back to 3-way merge' ' - rm -fr .git/rebase-apply && - git reset --hard && - git checkout -b lorem4 base3way && - test_config am.threeWay 1 && - git am lorem-move.patch && - test_path_is_missing .git/rebase-apply && - git diff --exit-code lorem -' - -test_expect_success 'am with config am.threeWay overridden by --no-3way' ' - rm -fr .git/rebase-apply && - git reset --hard && - git checkout -b lorem5 base3way && - test_config am.threeWay 1 && - test_must_fail git am --no-3way lorem-move.patch && - test_path_is_dir .git/rebase-apply -' - test_expect_success 'am can rename a file' ' grep "^rename from" rename.patch && rm -fr .git/rebase-apply && |