Re: [PATCH] commit: refuse to amend during conflict resolution

"Elijah Newren via GitGitGadget" [off-list ref] writes:

Let's make a mental note that the function receives these parameters:

static int parse_and_validate_options(int argc, const char *argv[],
				      const struct option *options,
				      const char * const usage[],
				      const char *prefix,
				      struct commit *current_head,
				      struct wt_status *s)

+	if (amend && whence == FROM_COMMIT) {
+		char *applying, *apply_dir, *stopped_sha, *amend_marker;
+		int in_am, conflicted_stop;
+
+		/* Check middle of revert */
+		if (refs_ref_exists(get_main_ref_store(the_repository),
+				    "REVERT_HEAD"))
+			die(_("You are in the middle of a revert -- cannot amend."));

"the_repository" can become "s->repo".  The same comment for other
checks in this block.