Revert "Merge branch 'zh/cherry-pick-help-is-only-for-sequencer' into next"

This reverts commit 9ea14ed, reversing
changes made to b95a81a, to solve it
differently with the zh/cherry-pick-advice topic.

Author: gitster

builtin/rebase.c

@@ -152,7 +152,6 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 		oidcpy(&replay.squash_onto, opts->squash_onto);
 		replay.have_squash_onto = 1;
 	}
-	replay.delete_cherry_pick_head = 1;
 
 	return replay;
 }

builtin/revert.c

@@ -127,8 +127,6 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
 			OPT_BOOL(0, "allow-empty", &opts->allow_empty, N_("preserve initially empty commits")),
 			OPT_BOOL(0, "allow-empty-message", &opts->allow_empty_message, N_("allow commits with empty messages")),
 			OPT_BOOL(0, "keep-redundant-commits", &opts->keep_redundant_commits, N_("keep redundant, empty commits")),
-			OPT_BOOL_F(0, "delete-cherry-pick-head", &opts->delete_cherry_pick_head,
-				   N_("delete CHERRY_PICK_HEAD when conflict occurs"), PARSE_OPT_HIDDEN),
 			OPT_END(),
 		};
 		options = parse_options_concat(options, cp_extra);

git-rebase--preserve-merges.sh

@@ -444,7 +444,7 @@ pick_one_preserving_merges () {
 			output eval git cherry-pick $allow_rerere_autoupdate \
 				$allow_empty_message \
 				${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
-				"$strategy_args" --delete-cherry-pick-head "$@" ||
+				"$strategy_args" "$@" ||
 				die_with_patch $sha1 "$(eval_gettext "Could not pick \$sha1")"
 			;;
 		esac

sequencer.c

@@ -397,22 +397,25 @@ static void free_message(struct commit *commit, struct commit_message *msg)
 	unuse_commit_buffer(commit, msg->message);
 }
 
-static void print_advice(struct replay_opts *opts, int show_hint)
+static void print_advice(struct repository *r, int show_hint,
+			 struct replay_opts *opts)
 {
 	char *msg = getenv("GIT_CHERRY_PICK_HELP");
 
 	if (msg) {
-		advise("%s\n", msg);
-	} else if (show_hint) {
-		if (opts->action == REPLAY_PICK) {
-			advise(_("Resolve all conflicts manually, mark them as resolved with\n"
-				 "\"git add/rm <conflicted_files>\", then run\n"
-				 "\"git cherry-pick --continue\".\n"
-				 "You can instead skip this commit: run \"git cherry-pick --skip\".\n"
-				 "To abort and get back to the state before \"git cherry-pick\",\n"
-				 "run \"git cherry-pick --abort\"."));
-
-		} else if (opts->no_commit)
+		fprintf(stderr, "%s\n", msg);
+		/*
+		 * A conflict has occurred but the porcelain
+		 * (typically rebase --interactive) wants to take care
+		 * of the commit itself so remove CHERRY_PICK_HEAD
+		 */
+		refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD",
+				NULL, 0);
+		return;
+	}
+
+	if (show_hint) {
+		if (opts->no_commit)
 			advise(_("after resolving the conflicts, mark the corrected paths\n"
 				 "with 'git add <paths>' or 'git rm <paths>'"));
 		else
@@ -2262,16 +2265,7 @@ static int do_pick_commit(struct repository *r,
 		      ? _("could not revert %s... %s")
 		      : _("could not apply %s... %s"),
 		      short_commit_name(commit), msg.subject);
-		print_advice(opts, res == 1);
-		if (opts->delete_cherry_pick_head) {
-			/*
-			 * A conflict has occurred but the porcelain
-			 * (typically rebase --interactive) wants to take care
-			 * of the commit itself so remove CHERRY_PICK_HEAD
-			 */
-			refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD",
-					NULL, 0);
-		}
+		print_advice(r, res == 1, opts);
 		repo_rerere(r, opts->allow_rerere_auto);
 		goto leave;
 	}

sequencer.h

@@ -49,7 +49,6 @@ struct replay_opts {
 	int reschedule_failed_exec;
 	int committer_date_is_author_date;
 	int ignore_date;
-	int delete_cherry_pick_head;
 
 	int mainline;
 

t/t3507-cherry-pick-conflict.sh

@@ -53,12 +53,9 @@ test_expect_success 'advice from failed cherry-pick' "
 	picked=\$(git rev-parse --short picked) &&
 	cat <<-EOF >expected &&
 	error: could not apply \$picked... picked
-	hint: Resolve all conflicts manually, mark them as resolved with
-	hint: \"git add/rm <conflicted_files>\", then run
-	hint: \"git cherry-pick --continue\".
-	hint: You can instead skip this commit: run \"git cherry-pick --skip\".
-	hint: To abort and get back to the state before \"git cherry-pick\",
-	hint: run \"git cherry-pick --abort\".
+	hint: after resolving the conflicts, mark the corrected paths
+	hint: with 'git add <paths>' or 'git rm <paths>'
+	hint: and commit the result with 'git commit'
 	EOF
 	test_must_fail git cherry-pick picked 2>actual &&
 
@@ -71,45 +68,20 @@ test_expect_success 'advice from failed cherry-pick --no-commit' "
 	picked=\$(git rev-parse --short picked) &&
 	cat <<-EOF >expected &&
 	error: could not apply \$picked... picked
-	hint: Resolve all conflicts manually, mark them as resolved with
-	hint: \"git add/rm <conflicted_files>\", then run
-	hint: \"git cherry-pick --continue\".
-	hint: You can instead skip this commit: run \"git cherry-pick --skip\".
-	hint: To abort and get back to the state before \"git cherry-pick\",
-	hint: run \"git cherry-pick --abort\".
+	hint: after resolving the conflicts, mark the corrected paths
+	hint: with 'git add <paths>' or 'git rm <paths>'
 	EOF
 	test_must_fail git cherry-pick --no-commit picked 2>actual &&
 
 	test_cmp expected actual
 "
 
-test_expect_success 'advice from failed cherry-pick with GIT_CHERRY_PICK_HELP' "
-	pristine_detach initial &&
-	(
-		picked=\$(git rev-parse --short picked) &&
-		cat <<-EOF >expected &&
-		error: could not apply \$picked... picked
-		hint: and then do something else
-		EOF
-		GIT_CHERRY_PICK_HELP='and then do something else' &&
-		export GIT_CHERRY_PICK_HELP &&
-		test_must_fail git cherry-pick picked 2>actual &&
-		test_cmp expected actual
-	)
-"
-
 test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
 	pristine_detach initial &&
 	test_must_fail git cherry-pick picked &&
 	test_cmp_rev picked CHERRY_PICK_HEAD
 '
 
-test_expect_success 'failed cherry-pick with --delete-cherry-pick-head does not set CHERRY_PICK_HEAD' '
-	pristine_detach initial &&
-	test_must_fail git cherry-pick --delete-cherry-pick-head picked &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
-'
-
 test_expect_success 'successful cherry-pick does not set CHERRY_PICK_HEAD' '
 	pristine_detach initial &&
 	git cherry-pick base &&
@@ -137,6 +109,16 @@ test_expect_success \
 	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 '
 
+test_expect_success 'GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD' '
+	pristine_detach initial &&
+	(
+		GIT_CHERRY_PICK_HELP="and then do something else" &&
+		export GIT_CHERRY_PICK_HELP &&
+		test_must_fail git cherry-pick picked
+	) &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+'
+
 test_expect_success 'git reset clears CHERRY_PICK_HEAD' '
 	pristine_detach initial &&