diff options
| author | Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> | 2015-06-04 17:04:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-04 10:42:41 -0700 |
| commit | d96a275b91bae1800cd43be0651e886e7e042a17 (patch) | |
| tree | 8b59f9edfb9cef63cfb9288a8a3fc617aee6ecb3 /t/t4150-am.sh | |
| parent | 8c8884ce97eed5ab27a8b6f9f54a6f3795eded19 (diff) | |
| download | git-d96a275b91bae1800cd43be0651e886e7e042a17.tar.gz | |
git-am: add am.threeWay config variablerl/am-3way-config
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.
Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4150-am.sh')
| -rwxr-xr-x | t/t4150-am.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 6ced98cfb4..b822a3918d 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -303,6 +303,25 @@ 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 && |