From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Aug 2017 20:53:00 +0000 (-0700)
Subject: Merge branch 'rs/merge-microcleanup' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/79ba7d301d2f2caf9276be7f9501331fb8fe6f50?hp=-c

Merge branch 'rs/merge-microcleanup' into next

Code clean-up.

* rs/merge-microcleanup:
merge: use skip_prefix()
---

79ba7d301d2f2caf9276be7f9501331fb8fe6f50
diff --combined builtin/merge.c
index e15f008950,d9db0baaf3..328945d609
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -7,7 -7,6 +7,7 @@@
   */
  
  #include "cache.h"
 +#include "config.h"
  #include "parse-options.h"
  #include "builtin.h"
  #include "lockfile.h"
@@@ -416,7 -415,7 +416,7 @@@ static void finish(struct commit *head_
  			DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
  		opts.detect_rename = DIFF_DETECT_RENAME;
  		diff_setup_done(&opts);
 -		diff_tree_sha1(head->hash, new_head->hash, "", &opts);
 +		diff_tree_oid(head, new_head, "", &opts);
  		diffcore_std(&opts);
  		diff_flush(&opts);
  	}
@@@ -537,7 -536,7 +537,7 @@@ static void parse_branch_merge_options(
  		die(_("Bad branch.%s.mergeoptions string: %s"), branch,
  		    split_cmdline_strerror(argc));
  	REALLOC_ARRAY(argv, argc + 2);
 -	memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
 +	MOVE_ARRAY(argv + 1, argv, argc + 1);
  	argc++;
  	argv[0] = "branch.*.mergeoptions";
  	parse_options(argc, argv, NULL, builtin_merge_options,
@@@ -566,7 -565,7 +566,7 @@@ static int git_merge_config(const char 
  	else if (!strcmp(k, "merge.renormalize"))
  		option_renormalize = git_config_bool(k, v);
  	else if (!strcmp(k, "merge.ff")) {
 -		int boolval = git_config_maybe_bool(k, v);
 +		int boolval = git_parse_maybe_bool(v);
  		if (0 <= boolval) {
  			fast_forward = boolval ? FF_ALLOW : FF_NO;
  		} else if (v && !strcmp(v, "only")) {
@@@ -606,13 -605,13 +606,13 @@@ static int read_tree_trivial(struct obj
  	opts.verbose_update = 1;
  	opts.trivial_merges_only = 1;
  	opts.merge = 1;
 -	trees[nr_trees] = parse_tree_indirect(common->hash);
 +	trees[nr_trees] = parse_tree_indirect(common);
  	if (!trees[nr_trees++])
  		return -1;
 -	trees[nr_trees] = parse_tree_indirect(head->hash);
 +	trees[nr_trees] = parse_tree_indirect(head);
  	if (!trees[nr_trees++])
  		return -1;
 -	trees[nr_trees] = parse_tree_indirect(one->hash);
 +	trees[nr_trees] = parse_tree_indirect(one);
  	if (!trees[nr_trees++])
  		return -1;
  	opts.fn = threeway_merge;
@@@ -840,7 -839,9 +840,7 @@@ static int suggest_conflicts(void
  	struct strbuf msgbuf = STRBUF_INIT;
  
  	filename = git_path_merge_msg();
 -	fp = fopen(filename, "a");
 -	if (!fp)
 -		die_errno(_("Could not open '%s' for writing"), filename);
 +	fp = xfopen(filename, "a");
  
  	append_conflicts_hint(&msgbuf);
  	fputs(msgbuf.buf, fp);
@@@ -940,7 -941,7 +940,7 @@@ static int default_edit_option(void
  		return 0;
  
  	if (e) {
 -		int v = git_config_maybe_bool(name, e);
 +		int v = git_parse_maybe_bool(e);
  		if (v < 0)
  			die(_("Bad value '%s' in environment '%s'"), e, name);
  		return v;
@@@ -1117,12 -1118,12 +1117,12 @@@ int cmd_merge(int argc, const char **ar
  	 * current branch.
  	 */
  	branch = branch_to_free = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
- 	if (branch && starts_with(branch, "refs/heads/"))
- 		branch += 11;
+ 	if (branch)
+ 		skip_prefix(branch, "refs/heads/", &branch);
  	if (!branch || is_null_oid(&head_oid))
  		head_commit = NULL;
  	else
 -		head_commit = lookup_commit_or_die(head_oid.hash, "HEAD");
 +		head_commit = lookup_commit_or_die(&head_oid, "HEAD");
  
  	init_diff_ui_defaults();
  	git_config(git_merge_config, NULL);
@@@ -1371,8 -1372,8 +1371,8 @@@
  			goto done;
  		}
  
 -		if (checkout_fast_forward(head_commit->object.oid.hash,
 -					  commit->object.oid.hash,
 +		if (checkout_fast_forward(&head_commit->object.oid,
 +					  &commit->object.oid,
  					  overwrite_ignore)) {
  			ret = 1;
  			goto done;