[PATCH v7 04/14] replay: die() instead of failing assert()
Junio C Hamano
Patrick Steinhardt
Johannes Schindelin
Elijah Newren
John Cai
Derrick Stolee
Phillip Wood
Calvin Wan
Toon Claes
Dragan Simic
Linus Arver
Christian Couder
Christian Couder
See Also
Prev Ref 1
2023-11-15 14:33:17 UTC
From: Elijah Newren <newren@gmail.com>

It's not a good idea for regular Git commands to use an assert() to
check for things that could happen but are not supported.

Let's die() with an explanation of the issue instead.

Co-authored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 builtin/replay.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/builtin/replay.c b/builtin/replay.c
index afabb844d3..32dbaaf028 100644
--- a/builtin/replay.c
+++ b/builtin/replay.c
@@ -179,7 +179,12 @@ int cmd_replay(int argc, const char **argv, const char *prefix)
 		fprintf(stderr, "Rebasing %s...\r",
-		assert(commit->parents && !commit->parents->next);
+		if (!commit->parents)
+			die(_("replaying down to root commit is not supported yet!"));
+		if (commit->parents->next)
+			die(_("replaying merge commits is not supported yet!"));
 		base = commit->parents->item;
 		next_tree = repo_get_commit_tree(the_repository, commit);