Add support for branch.*.mergeoptions for setting default options for
all branches. This new value shares semantics with the existing
branch.<name>.mergeoptions variable. If a branch specific value is
found, that value will be used.
The need for this arises from the fact that there is currently not an
easy way to set merge options for all branches. Instead of having to
specify merge options for each individual branch there should be a way
to set defaults for all branches and then override a specific branch's
options.
The approach taken is to make note of whether a branch specific
mergeoptions key has been seen and only apply the global value if it
hasn't.
Signed-off-by: Michael Grubb <devel@xxxxxxxxxxxxx>
---
Documentation/git-merge.txt | 3 +++
builtin/merge.c | 40 +++++++++++++++++++++++++++++++++-------
t/t7600-merge.sh | 27 +++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index e2e6aba..eaab3e4 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -307,6 +307,9 @@ branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and
supported options are the same as those of 'git merge', but option
values containing whitespace characters are currently not supported.
+ The special value '*' for <name> may be used to configure default
+ options for all branches. Values for specific branch names will
+ override the this default.
SEE ALSO
--------
diff --git a/builtin/merge.c b/builtin/merge.c
index d171c63..9fe129f 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -32,6 +32,13 @@
#define NO_FAST_FORWARD (1<<2)
#define NO_TRIVIAL (1<<3)
+#define MERGEOPTIONS_DEFAULT (1<<0)
+#define MERGEOPTIONS_BRANCH (1<<1)
+
+struct merge_options_cb {
+ int override_default;
+};
+
struct strategy {
const char *name;
unsigned attr;
@@ -505,24 +512,42 @@ cleanup:
static int git_merge_config(const char *k, const char *v, void *cb)
{
- if (branch && !prefixcmp(k, "branch.") &&
- !prefixcmp(k + 7, branch) &&
- !strcmp(k + 7 + strlen(branch), ".mergeoptions")) {
+ int merge_option_mode = 0;
+ struct merge_options_cb *merge_options =
+ (struct merge_options_cb *)cb;
+
+ if (!strcmp(k, "branch.*.mergeoptions"))
+ merge_option_mode = MERGEOPTIONS_DEFAULT;
+ else if (branch && !prefixcmp(k, "branch.") &&
+ !prefixcmp(k + 7, branch) &&
+ !strcmp(k + 7 + strlen(branch), ".mergeoptions"))
+ merge_option_mode = MERGEOPTIONS_BRANCH;
+
+ if ((merge_option_mode == MERGEOPTIONS_DEFAULT &&
+ !merge_options->override_default) ||
+ merge_option_mode == MERGEOPTIONS_BRANCH) {
const char **argv;
int argc;
char *buf;
buf = xstrdup(v);
argc = split_cmdline(buf, &argv);
- if (argc < 0)
- die(_("Bad branch.%s.mergeoptions string: %s"), branch,
- split_cmdline_strerror(argc));
+ if (argc < 0) {
+ if (merge_option_mode == 1)
+ die(_("Bad merge.mergeoptions string: %s"),
+ split_cmdline_strerror(argc));
+ else
+ die(_("Bad branch.%s.mergeoptions string: %s"), branch,
+ split_cmdline_strerror(argc));
+ }
argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
argc++;
parse_options(argc, argv, NULL, builtin_merge_options,
builtin_merge_usage, 0);
free(buf);
+ if (merge_option_mode == MERGEOPTIONS_BRANCH)
+ merge_options->override_default = 1;
}
if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat"))
@@ -987,6 +1012,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
const char *head_arg;
int flag, head_invalid = 0, i;
int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
+ struct merge_options_cb merge_options = {0};
struct commit_list *common = NULL;
const char *best_strategy = NULL, *wt_strategy = NULL;
struct commit_list **remotes = &remoteheads;
@@ -1004,7 +1030,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (is_null_sha1(head))
head_invalid = 1;
- git_config(git_merge_config, NULL);
+ git_config(git_merge_config, &merge_options);
/* for color.ui */
if (diff_use_color_default == -1)
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index e84e822..cea2b31 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -415,6 +415,33 @@ test_expect_success 'merge c0 with c1 (no-ff)' '
test_debug 'git log --graph --decorate --oneline --all'
+test_expect_success 'merge c0 with c1 (global no-ff)' '
+ git reset --hard c0 &&
+ git config --unset branch.master.mergeoptions &&
+ git config "branch.*.mergeoptions" "--no-ff" &&
+ test_tick &&
+ git merge c1 &&
+ git config --remove-section "branch.*" &&
+ verify_merge file result.1 &&
+ verify_parents $c0 $c1
+'
+
+test_debug 'git log --graph --decorate --oneline --all'
+
+test_expect_success 'combine merge.mergeoptions with branch.x.mergeoptions' '
+ git reset --hard c0 &&
+ git config --remove-section branch.master &&
+ git config "branch.*.mergeoptions" "--no-ff" &&
+ git config branch.master.mergeoptions "--ff" &&
+ test_tick &&
+ git merge c1 &&
+ git config --remove-section "branch.*" &&
+ verify_merge file result.1 &&
+ verify_parents "$c0"
+'
+
+test_debug 'git log --graph --decorate --oneline --all'
+
test_expect_success 'combining --squash and --no-ff is refused' '
test_must_fail git merge --squash --no-ff c1 &&
test_must_fail git merge --no-ff --squash c1
--
1.7.5
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html