diff options
author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-03-14 17:05:07 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 10:08:53 -0700 |
commit | 5a99c1ac1a9640f7ee0374e9b90523f500bdbb5a (patch) | |
tree | 67ce2cd1795becb3ca991ff80dadc779c560ca57 /builtin | |
parent | dbeaf8e8c0ada5ba6a8c379e2ad7bab7e815ba79 (diff) | |
download | git-5a99c1ac1a9640f7ee0374e9b90523f500bdbb5a.tar.gz |
checkout: fix interaction between --conflict and --merge
When using "git checkout" to recreate merge conflicts or merge
uncommitted changes when switching branch "--conflict" sensibly implies
"--merge". Unfortunately the way this is implemented means that "git
checkout --conflict=diff3 --no-merge" implies "--merge" violating the
usual last-one-wins rule. Fix this by only overriding the value of
opts->merge if "--conflicts" comes after "--no-merge" or "-[-no]-merge"
is not given on the command line.
The behavior of "git checkout --merge --no-conflict" is unchanged and
will still merge on the basis that the "-[-no]-conflict" options are
primarily intended to affect the conflict style and so "--no-conflict"
should cancel a previous "--conflict" but not override "--merge".
Of the four new tests the second one tests the behavior change
introduced by this commit, the other three check that this commit does
not regress the existing behavior.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/checkout.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 0e5d1af75b..30d13c9e14 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -100,7 +100,7 @@ struct checkout_opts { struct tree *source_tree; }; -#define CHECKOUT_OPTS_INIT { .conflict_style = -1 } +#define CHECKOUT_OPTS_INIT { .conflict_style = -1, .merge = -1 } struct branch_info { char *name; /* The short name used */ @@ -1633,6 +1633,9 @@ static int parse_opt_conflict(const struct option *o, const char *arg, int unset opts->conflict_style = parse_conflict_style_name(arg); if (opts->conflict_style < 0) return error(_("unknown conflict style '%s'"), arg); + /* --conflict overrides a previous --no-merge */ + if (!opts->merge) + opts->merge = -1; return 0; } @@ -1740,8 +1743,9 @@ static int checkout_main(int argc, const char **argv, const char *prefix, opts->show_progress = isatty(2); } - if (opts->conflict_style >= 0) - opts->merge = 1; /* implied */ + /* --conflicts implies --merge */ + if (opts->merge == -1) + opts->merge = opts->conflict_style >= 0; if (opts->force) { opts->discard_changes = 1; |