Rebase to Git v2.56.0

Documentation/RelNotes/2.56.0.adoc

@@ -867,12 +867,6 @@ Fixes since v2.55
    Additionally, an obsolete variable used for retired Azure Pipelines
    environments has been removed.
 
- * Teach 'am', 'revert', and 'rebase' that running 'commit --amend' or a
-   partial 'commit <paths>' makes no sense during operations that stop
-   and return control to the user to resolve conflicts left in the
-   working tree, just like 'cherry-pick' and 'merge' do.
-   (merge cc499d40e5 en/no-amend-during-conflicts later to maint).
-
  * The error path in 'git submodule--helper' has been updated to plug a
    memory leak when a repository handle could not be obtained,
    leveraging an updated idempotent repo_clear().

GIT-VERSION-GEN

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v2.56.0-rc2
+DEF_VER=v2.56.0
 
 LF='
 '

builtin/commit.c

@@ -515,25 +515,13 @@ static const char *prepare_index(const char **argv, const char *prefix,
 	 */
 	commit_style = COMMIT_PARTIAL;
 
-	switch (sequencer_ongoing_operation(the_repository, whence)) {
-	case ONGOING_NONE:
-		break;
-	case ONGOING_MERGE:
-		die(_("cannot do a partial commit during a merge."));
-	case ONGOING_CHERRY_PICK:
-		die(_("cannot do a partial commit during a cherry-pick."));
-	case ONGOING_REBASE_NOW_EMPTY:
-		/*
-		 * A pick that became empty is not a conflict, and creating
-		 * a new commit (partial or not) poses no problem.
-		 */
-		break;
-	case ONGOING_REVERT:
-		die(_("cannot do a partial commit during a revert."));
-	case ONGOING_AM:
-		die(_("cannot do a partial commit during an am session."));
-	case ONGOING_REBASE_CONFLICT:
-		die(_("cannot do a partial commit while resolving conflicts during a rebase."));
+	if (whence != FROM_COMMIT) {
+		if (whence == FROM_MERGE)
+			die(_("cannot do a partial commit during a merge."));
+		else if (is_from_cherry_pick(whence))
+			die(_("cannot do a partial commit during a cherry-pick."));
+		else if (is_from_rebase(whence))
+			die(_("cannot do a partial commit during a rebase."));
 	}
 
 	if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec))
@@ -905,7 +893,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	 */
 	else if (whence == FROM_MERGE)
 		hook_arg1 = "merge";
-	else if (is_from_cherry_pick(whence) || is_from_rebase_now_empty(whence)) {
+	else if (is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) {
 		hook_arg1 = "commit";
 		hook_arg2 = "CHERRY_PICK_HEAD";
 	}
@@ -1098,7 +1086,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		if (amend)
 			fputs(_(empty_amend_advice), stderr);
 		else if (is_from_cherry_pick(whence) ||
-			 is_from_rebase_now_empty(whence)) {
+			 whence == FROM_REBASE_PICK) {
 			fputs(_(empty_cherry_pick_advice), stderr);
 			if (whence == FROM_CHERRY_PICK_SINGLE)
 				fputs(_(empty_cherry_pick_advice_single), stderr);
@@ -1338,30 +1326,15 @@ static int parse_and_validate_options(int argc, const char *argv[],
 		use_editor = 0;
 
 	/* Sanity check options */
-	if (amend) {
-		if (!current_head)
-			die(_("You have nothing to amend."));
-		/*
-		 * Refuse to amend in the middle of any operation that is
-		 * meant to record its result as a new commit on top of HEAD
-		 * rather than by rewriting HEAD.
-		 */
-		switch (sequencer_ongoing_operation(s->repo, whence)) {
-		case ONGOING_NONE:
-			break;
-		case ONGOING_MERGE:
+	if (amend && !current_head)
+		die(_("You have nothing to amend."));
+	if (amend && whence != FROM_COMMIT) {
+		if (whence == FROM_MERGE)
 			die(_("You are in the middle of a merge -- cannot amend."));
-		case ONGOING_CHERRY_PICK:
+		else if (is_from_cherry_pick(whence))
 			die(_("You are in the middle of a cherry-pick -- cannot amend."));
-		case ONGOING_REBASE_NOW_EMPTY:
-			die(_("The now-empty commit has been dropped -- cannot amend."));
-		case ONGOING_REVERT:
-			die(_("You are in the middle of a revert -- cannot amend."));
-		case ONGOING_AM:
-			die(_("You are in the middle of an am session -- cannot amend."));
-		case ONGOING_REBASE_CONFLICT:
-			die(_("You are resolving conflicts during a rebase -- cannot amend."));
-		}
+		else if (whence == FROM_REBASE_PICK)
+			die(_("You are in the middle of a rebase -- cannot amend."));
 	}
 	if (fixup_message && squash_message)
 		die(_("options '%s' and '%s' cannot be used together"), "--squash", "--fixup");
@@ -1380,7 +1353,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
 	if (amend && !use_message && !fixup_message)
 		use_message = "HEAD";
 	if (!use_message && !is_from_cherry_pick(whence) &&
-	    !is_from_rebase_now_empty(whence) && renew_authorship)
+	    !is_from_rebase(whence) && renew_authorship)
 		die(_("--reset-author can be used only with -C, -c or --amend."));
 	if (use_message) {
 		use_message_buffer = read_commit_message(use_message);
@@ -1389,7 +1362,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
 			author_message_buffer = use_message_buffer;
 		}
 	}
-	if ((is_from_cherry_pick(whence) || is_from_rebase_now_empty(whence)) &&
+	if ((is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) &&
 	    !renew_authorship) {
 		author_message = "CHERRY_PICK_HEAD";
 		author_message_buffer = read_commit_message(author_message);
@@ -1916,7 +1889,7 @@ int cmd_commit(int argc,
 		if (!reflog_msg)
 			reflog_msg = is_from_cherry_pick(whence)
 					? "commit (cherry-pick)"
-					: is_from_rebase_now_empty(whence)
+					: is_from_rebase(whence)
 					? "commit (rebase)"
 					: "commit";
 		commit_list_insert(current_head, &parents);

builtin/difftool.c

@@ -677,8 +677,17 @@ static int run_dir_diff(struct repository *repo,
 	}
 
 finish:
-	if (fp)
+	if (fp) {
 		fclose(fp);
+		/*
+		 * The child process was started, but there was an error before
+		 * it finished; After closing the output pipe, we need to wait
+		 * for the process to finish, otherwise the  atexit handler
+		 * `cleanup_children()` would try to access the stack-allocated
+		 * `child`.
+		*/
+		finish_command(child); /* best effort; ignore result */
+	}
 
 	hashmap_clear_and_free(&working_tree_dups, struct working_tree_entry, entry);
 	hashmap_clear_and_free(&wt_modified, struct path_entry, entry);