From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 22:03:25 +0000 (-0700)
Subject: Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
X-Git-Tag: v1.7.6-rc0~67^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=541d1fa85ca4741e8b6db281f3d788dcfc423bdc;p=git.git

Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config

* jc/maint-branch-mergeoptions:
  merge: make branch.<name>.mergeoptions correctly override merge.<option>
---

541d1fa85ca4741e8b6db281f3d788dcfc423bdc
diff --cc builtin/merge.c
index d54e7ddbb,b0d3c09bf..0f03dff11
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -56,12 -54,9 +56,13 @@@ static size_t use_strategies_nr, use_st
  static const char **xopts;
  static size_t xopts_nr, xopts_alloc;
  static const char *branch;
+ static char *branch_mergeoptions;
 +static int option_renormalize;
  static int verbosity;
  static int allow_rerere_auto;
 +static int abort_current_merge;
 +static int show_progress = -1;
 +static int default_to_upstream;
  
  static struct strategy all_strategy[] = {
  	{ "recursive",  DEFAULT_TWOHEAD | NO_TRIVIAL },
@@@ -503,6 -475,25 +504,26 @@@ cleanup
  	strbuf_release(&bname);
  }
  
+ static void parse_branch_merge_options(char *bmo)
+ {
+ 	const char **argv;
+ 	int argc;
+ 
+ 	if (!bmo)
+ 		return;
+ 	argc = split_cmdline(bmo, &argv);
+ 	if (argc < 0)
 -		die("Bad branch.%s.mergeoptions string", branch);
++		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++;
+ 	argv[0] = "branch.*.mergeoptions";
+ 	parse_options(argc, argv, NULL, builtin_merge_options,
+ 		      builtin_merge_usage, 0);
+ 	free(argv);
+ }
+ 
  static int git_merge_config(const char *k, const char *v, void *cb)
  {
  	if (branch && !prefixcmp(k, "branch.") &&
@@@ -1010,46 -927,10 +1019,48 @@@ int cmd_merge(int argc, const char **ar
  	if (diff_use_color_default == -1)
  		diff_use_color_default = git_use_color_default;
  
+ 	if (branch_mergeoptions)
+ 		parse_branch_merge_options(branch_mergeoptions);
  	argc = parse_options(argc, argv, prefix, builtin_merge_options,
  			builtin_merge_usage, 0);
 +
 +	if (verbosity < 0 && show_progress == -1)
 +		show_progress = 0;
 +
 +	if (abort_current_merge) {
 +		int nargc = 2;
 +		const char *nargv[] = {"reset", "--merge", NULL};
 +
 +		if (!file_exists(git_path("MERGE_HEAD")))
 +			die(_("There is no merge to abort (MERGE_HEAD missing)."));
 +
 +		/* Invoke 'git reset --merge' */
 +		return cmd_reset(nargc, nargv, prefix);
 +	}
 +
 +	if (read_cache_unmerged())
 +		die_resolve_conflict("merge");
 +
 +	if (file_exists(git_path("MERGE_HEAD"))) {
 +		/*
 +		 * There is no unmerged entry, don't advise 'git
 +		 * add/rm <file>', just 'git commit'.
 +		 */
 +		if (advice_resolve_conflict)
 +			die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
 +				  "Please, commit your changes before you can merge."));
 +		else
 +			die(_("You have not concluded your merge (MERGE_HEAD exists)."));
 +	}
 +	if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
 +		if (advice_resolve_conflict)
 +			die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 +			    "Please, commit your changes before you can merge.");
 +		else
 +			die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).");
 +	}
 +	resolve_undo_clear();
 +
  	if (verbosity < 0)
  		show_diffstat = 0;
  
diff --cc t/t7600-merge.sh
index 87d5d788c,56c653d02..46b61ec3e
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@@ -322,8 -370,40 +322,41 @@@ test_expect_success 'merge c1 with c2 (
  	verify_mergeheads $c2
  '
  
 -test_debug 'gitk --all'
 +test_debug 'git log --graph --decorate --oneline --all'
  
+ test_expect_success 'merge c1 with c2 (log in config)' '
+ 	git config branch.master.mergeoptions "" &&
+ 	git reset --hard c1 &&
+ 	git merge --log c2 &&
+ 	git show -s --pretty=tformat:%s%n%b >expect &&
+ 
+ 	git config branch.master.mergeoptions --log &&
+ 	git reset --hard c1 &&
+ 	git merge c2 &&
+ 	git show -s --pretty=tformat:%s%n%b >actual &&
+ 
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'merge c1 with c2 (log in config gets overridden)' '
 -	(
 -		git config --remove-section branch.master
 -		git config --remove-section merge
 -	)
++	test_when_finished "git config --remove-section branch.master" &&
++	test_when_finished "git config --remove-section merge" &&
++	test_might_fail git config --remove-section branch.master &&
++	test_might_fail git config --remove-section merge &&
++
+ 	git reset --hard c1 &&
+ 	git merge c2 &&
+ 	git show -s --pretty=tformat:%s%n%b >expect &&
+ 
+ 	git config branch.master.mergeoptions "--no-log" &&
+ 	git config merge.log true &&
+ 	git reset --hard c1 &&
+ 	git merge c2 &&
+ 	git show -s --pretty=tformat:%s%n%b >actual &&
+ 
+ 	test_cmp expect actual
+ '
+ 
  test_expect_success 'merge c1 with c2 (squash in config)' '
  	git reset --hard c1 &&
  	git config branch.master.mergeoptions "--squash" &&