From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Aug 2018 22:30:44 +0000 (-0700)
Subject: Merge branch 'js/rebase-merge-octopus'
X-Git-Tag: v2.19.0-rc0~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2b9afea37207323d629953c639542c0e4c87e484

Merge branch 'js/rebase-merge-octopus'

"git rebase --rebase-merges" mode now handles octopus merges as
well.

* js/rebase-merge-octopus:
rebase --rebase-merges: adjust man page for octopus support
rebase --rebase-merges: add support for octopus merges
merge: allow reading the merge commit message from a file
---

2b9afea37207323d629953c639542c0e4c87e484
diff --cc sequencer.c
index 5a068fd351,bcc43699cd..f12b61fc93
--- a/sequencer.c
+++ b/sequencer.c
@@@ -2987,9 -3018,52 +3027,52 @@@ static int do_merge(struct commit *comm
  		goto leave_merge;
  	}
  
+ 	if (to_merge->next) {
+ 		/* Octopus merge */
+ 		struct child_process cmd = CHILD_PROCESS_INIT;
+ 
+ 		if (read_env_script(&cmd.env_array)) {
+ 			const char *gpg_opt = gpg_sign_opt_quoted(opts);
+ 
+ 			ret = error(_(staged_changes_advice), gpg_opt, gpg_opt);
+ 			goto leave_merge;
+ 		}
+ 
+ 		cmd.git_cmd = 1;
+ 		argv_array_push(&cmd.args, "merge");
+ 		argv_array_push(&cmd.args, "-s");
+ 		argv_array_push(&cmd.args, "octopus");
+ 		argv_array_push(&cmd.args, "--no-edit");
+ 		argv_array_push(&cmd.args, "--no-ff");
+ 		argv_array_push(&cmd.args, "--no-log");
+ 		argv_array_push(&cmd.args, "--no-stat");
+ 		argv_array_push(&cmd.args, "-F");
 -		argv_array_push(&cmd.args, git_path_merge_msg());
++		argv_array_push(&cmd.args, git_path_merge_msg(the_repository));
+ 		if (opts->gpg_sign)
+ 			argv_array_push(&cmd.args, opts->gpg_sign);
+ 
+ 		/* Add the tips to be merged */
+ 		for (j = to_merge; j; j = j->next)
+ 			argv_array_push(&cmd.args,
+ 					oid_to_hex(&j->item->object.oid));
+ 
+ 		strbuf_release(&ref_name);
 -		unlink(git_path_cherry_pick_head());
++		unlink(git_path_cherry_pick_head(the_repository));
+ 		rollback_lock_file(&lock);
+ 
+ 		rollback_lock_file(&lock);
+ 		ret = run_command(&cmd);
+ 
+ 		/* force re-reading of the cache */
+ 		if (!ret && (discard_cache() < 0 || read_cache() < 0))
+ 			ret = error(_("could not read index"));
+ 		goto leave_merge;
+ 	}
+ 
+ 	merge_commit = to_merge->item;
  	write_message(oid_to_hex(&merge_commit->object.oid), GIT_SHA1_HEXSZ,
 -		      git_path_merge_head(), 0);
 -	write_message("no-ff", 5, git_path_merge_mode(), 0);
 +		      git_path_merge_head(the_repository), 0);
 +	write_message("no-ff", 5, git_path_merge_mode(the_repository), 0);
  
  	bases = get_merge_bases(head_commit, merge_commit);
  	if (bases && !oidcmp(&merge_commit->object.oid,