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>
Junio C Hamano committed
Jul 24, 2015 at 10:55 UTC
15dc5b5fb049bdf7abdbc610a5dec040c4d499bd
4 files changed
+2
-41
Documentation/config.txt
-8
@@ -769,14 +769,6 @@ am.keepcr::
769
by giving '--no-keep-cr' from the command line.
770
See linkgit:git-am[1], linkgit:git-mailsplit[1].
771
772
-am.threeWay::
773
- By default, `git am` will fail if the patch does not apply cleanly. When
774
- set to true, this setting tells `git am` to fall back on 3-way merge if
775
- the patch records the identity of blobs it is supposed to apply to and
776
- we have those blobs available locally (equivalent to giving the `--3way`
777
- option from the command line). Defaults to `false`.
778
- See linkgit:git-am[1].
779
-
772
apply.ignoreWhitespace::
773
When set to 'change', tells 'git apply' to ignore changes in
774
whitespace, in the same way as the '--ignore-space-change'
Documentation/git-am.txt
+2
-5
@@ -10,7 +10,7 @@ SYNOPSIS
10
--------
11
[verse]
12
'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
13
- [--[no-]3way] [--interactive] [--committer-date-is-author-date]
13
+ [--3way] [--interactive] [--committer-date-is-author-date]
14
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
15
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
16
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
@@ -90,13 +90,10 @@ default. You can use `--no-utf8` to override this.
90
91
-3::
92
--3way::
93
---no-3way::
93
When the patch does not apply cleanly, fall back on
94
3-way merge if the patch records the identity of blobs
95
it is supposed to apply to and we have those blobs
97
- available locally. `--no-3way` can be used to override
98
- am.threeWay configuration variable. For more information,
99
- see am.threeWay in linkgit:git-config[1].
96
+ available locally.
97
98
--ignore-space-change::
99
--ignore-whitespace::
git-am.sh
-9
@@ -393,11 +393,6 @@ then
393
keepcr=t
394
fi
395
396
-if test "$(git config --bool --get am.threeWay)" = true
397
-then
398
- threeway=t
399
-fi
400
-
396
while test $# != 0
397
do
398
case "$1" in
@@ -409,8 +404,6 @@ it will be removed. Please do not use it anymore."
404
;;
405
-3|--3way)
406
threeway=t ;;
412
- --no-3way)
413
- threeway=f ;;
407
-s|--signoff)
408
sign=t ;;
409
-u|--utf8)
@@ -680,8 +673,6 @@ fi
673
if test "$(cat "$dotest/threeway")" = t
674
then
675
threeway=t
683
-else
684
- threeway=f
676
fi
677
git_apply_opt=$(cat "$dotest/apply-opt")
678
if test "$(cat "$dotest/sign")" = t
t/t4150-am.sh
-19
@@ -303,25 +303,6 @@ test_expect_success 'am -3 -p0 can read --no-prefix patch' '
303
git diff --exit-code lorem
304
'
305
306
-test_expect_success 'am with config am.threeWay falls back to 3-way merge' '
307
- rm -fr .git/rebase-apply &&
308
- git reset --hard &&
309
- git checkout -b lorem4 base3way &&
310
- test_config am.threeWay 1 &&
311
- git am lorem-move.patch &&
312
- test_path_is_missing .git/rebase-apply &&
313
- git diff --exit-code lorem
314
-'
315
-
316
-test_expect_success 'am with config am.threeWay overridden by --no-3way' '
317
- rm -fr .git/rebase-apply &&
318
- git reset --hard &&
319
- git checkout -b lorem5 base3way &&
320
- test_config am.threeWay 1 &&
321
- test_must_fail git am --no-3way lorem-move.patch &&
322
- test_path_is_dir .git/rebase-apply
323
-'
324
-
306
test_expect_success 'am can rename a file' '
307
grep "^rename from" rename.patch &&
308
rm -fr .git/rebase-apply &&