[PATCH 1/2] replay: handle failure to create commits

[Patrick Monette <pmonette@google.com>]

When pick_regular_commit() returns NULL, the caller relies on
`result->clean` to figure out what happened. 1 means success, 0 means a
conflict, and a negative value means an error.

Right now, if the commit creation fails, `result->clean` stays at 1. The
caller doesn't expect the combination of NULL + clean == 1, so it breaks
out of the loop, but the rest of the function treats this as a success.

The next commit will add a failure mode (signing) to the commit
creation, so this needs to be handled correctly. Set `result->clean`
to -1 when the commit creation fails.

Signed-off-by: Patrick Monette <pmonette@google.com>
---
 replay.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/replay.c b/replay.c
index f415103023..ad87863565 100644
--- a/replay.c
+++ b/replay.c
@@ -291,6 +291,7 @@ static struct commit *pick_regular_commit(struct repository *repo,
 					  enum replay_empty_commit_action empty)
 {
 	struct tree *pickme_tree, *base_tree, *replayed_base_tree;
+	struct commit *new_commit;
 
 	if (pickme->parents)
 		base_tree = repo_get_commit_tree(repo, pickme->parents->item);
@@ -361,7 +362,11 @@ static struct commit *pick_regular_commit(struct repository *repo,
 		}
 	}
 
-	return create_commit(repo, result->tree, pickme, replayed_base, mode);
+	new_commit = create_commit(repo, result->tree, pickme, replayed_base,
+				   mode);
+	if (!new_commit)
+		result->clean = -1;
+	return new_commit;
 }
 
 void replay_result_release(struct replay_result *result)
-- 
2.56.0.rc1.315.gc6ed9934b7-goog