From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Apr 2024 20:21:34 +0000 (-0700)
Subject: Merge branch 'pb/advice-merge-conflict'
X-Git-Tag: v2.45.0-rc0~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac16f55697211ae4ef557706a098b8ed34a7fda6;p=thirdparty%2Fgit.git

Merge branch 'pb/advice-merge-conflict'

Hints that suggest what to do after resolving conflicts can now be
squelched by disabling advice.mergeConflict.

Acked-by: Phillip Wood <phillip.wood123@gmail.com>
cf. <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com>

* pb/advice-merge-conflict:
  builtin/am: allow disabling conflict advice
  sequencer: allow disabling conflict advice
---

ac16f55697211ae4ef557706a098b8ed34a7fda6
diff --cc sequencer.c
index 4e14fa6541,019f0a0b27..f4e6284a6c
--- a/sequencer.c
+++ b/sequencer.c
@@@ -471,15 -464,10 +471,15 @@@ N_("Resolve all conflicts manually, mar
  static void print_advice(struct repository *r, int show_hint,
  			 struct replay_opts *opts)
  {
 -	char *msg = getenv("GIT_CHERRY_PICK_HELP");
 +	const char *msg;
 +
 +	if (is_rebase_i(opts))
 +		msg = rebase_resolvemsg;
 +	else
 +		msg = getenv("GIT_CHERRY_PICK_HELP");
  
  	if (msg) {
- 		advise("%s\n", msg);
+ 		advise_if_enabled(ADVICE_MERGE_CONFLICT, "%s", msg);
  		/*
  		 * A conflict has occurred but the porcelain
  		 * (typically rebase --interactive) wants to take care