git-am: add am.threeWay config variable
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: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Remi Lespinet committed
Aug 4, 2015 at 22:19 UTC
e97a5e765db06995c3b027a5d7dceb6b4f2cba02
4 files changed
+34
-2
Documentation/config.txt
+8
@@ -769,6 +769,14 @@ 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
+
780
apply.ignoreWhitespace::
781
When set to 'change', tells 'git apply' to ignore changes in
782
whitespace, in the same way as the '--ignore-space-change'
Documentation/git-am.txt
+5
-2
@@ -10,7 +10,7 @@ SYNOPSIS
10
--------
11
[verse]
12
'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
13
- [--3way] [--interactive] [--committer-date-is-author-date]
13
+ [--[no-]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,10 +90,13 @@ default. You can use `--no-utf8` to override this.
90
91
-3::
92
--3way::
93
+--no-3way::
94
When the patch does not apply cleanly, fall back on
95
3-way merge if the patch records the identity of blobs
96
it is supposed to apply to and we have those blobs
96
- available locally.
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].
100
101
--ignore-space-change::
102
--ignore-whitespace::
builtin/am.c
+2
@@ -152,6 +152,8 @@ static void am_state_init(struct am_state *state, const char *dir)
152
153
state->prec = 4;
154
155
+ git_config_get_bool("am.threeway", &state->threeway);
156
+
157
state->utf8 = 1;
158
159
git_config_get_bool("am.messageid", &state->message_id);
t/t4150-am.sh
+19
@@ -551,6 +551,25 @@ test_expect_success 'am -3 -p0 can read --no-prefix patch' '
551
git diff --exit-code lorem
552
'
553
554
+test_expect_success 'am with config am.threeWay falls back to 3-way merge' '
555
+ rm -fr .git/rebase-apply &&
556
+ git reset --hard &&
557
+ git checkout -b lorem4 base3way &&
558
+ test_config am.threeWay 1 &&
559
+ git am lorem-move.patch &&
560
+ test_path_is_missing .git/rebase-apply &&
561
+ git diff --exit-code lorem
562
+'
563
+
564
+test_expect_success 'am with config am.threeWay overridden by --no-3way' '
565
+ rm -fr .git/rebase-apply &&
566
+ git reset --hard &&
567
+ git checkout -b lorem5 base3way &&
568
+ test_config am.threeWay 1 &&
569
+ test_must_fail git am --no-3way lorem-move.patch &&
570
+ test_path_is_dir .git/rebase-apply
571
+'
572
+
573
test_expect_success 'am can rename a file' '
574
grep "^rename from" rename.patch &&
575
rm -fr .git/rebase-apply &&