diff options
| author | Elijah Newren <newren@gmail.com> | 2023-11-24 12:10:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-26 10:10:48 +0900 |
| commit | a9df61ace31b84c9609dfa4875e93b8c92e06e56 (patch) | |
| tree | 11a223de282c664a7fa44b471685b017a7b6175e | |
| parent | d46da6d90be99f91988eececd5368170b0eded1f (diff) | |
replay: die() instead of failing assert()
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/replay.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin/replay.c b/builtin/replay.c index 7998f6ed04..f48c5ed255 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", oid_to_hex(&commit->object.oid)); - 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); |