replay: die descriptively when invalid commit-ish

Giving an invalid commit-ish to `--onto` or `--advance` makes
git-replay(1) fail with:

    fatal: Replaying down to root commit is not supported yet!

Going backwards from this point:

1. `onto` is `NULL` from `determine_replay_mode`;
2. that function in turn calls `peel_committish`; and
3. here we return `NULL` if `repo_get_oid` fails.

Let’s die immediately with a descriptive error message instead.

Doing this also provides us with a descriptive error if we “forget” to
provide an argument to `--onto` (but we really do unintentionally):[1]

    $ git replay --onto ^main topic1
    fatal: '^main' is not a valid commit-ish

† 1: The argument to `--onto` is mandatory and the option parser accepts
     both `--onto=<name>` (stuck form) and `--onto name`. The latter
     form makes it easy to unintentionally pass something to the option
     when you really meant to pass a positional argument.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/replay.c b/builtin/replay.c
index 69c4c551297c03dcd32adac016e57f874e354d28..6389b2d9404f867c8cec7aad68e8acc1c09a4b33 100644 (file)
--- a/builtin/replay.c
+++ b/builtin/replay.c
@@ -39,7 +39,7 @@ static struct commit *peel_committish(struct repository *repo, const char *name)
        struct object_id oid;
 
        if (repo_get_oid(repo, name, &oid))
-               return NULL;
+               die(_("'%s' is not a valid commit-ish"), name);
        obj = parse_object(repo, &oid);
        return (struct commit *)repo_peel_to_type(repo, name, 0, obj,
                                                  OBJ_COMMIT);

diff --git a/t/t3650-replay-basics.sh b/t/t3650-replay-basics.sh
index cf3aacf3551f8ee16803ae2a1ddbb7d9d6935980..5542bf146d4f0c704302fc7229375b2896db8a38 100755 (executable)
--- a/t/t3650-replay-basics.sh
+++ b/t/t3650-replay-basics.sh
@@ -51,6 +51,22 @@ test_expect_success 'setup bare' '
        git clone --bare . bare
 '
 
+test_expect_success '--onto with invalid commit-ish' '
+       cat >expect <<-EOF &&
+       fatal: ${SQ}refs/not-valid${SQ} is not a valid commit-ish
+       EOF
+       test_must_fail git replay --onto=refs/not-valid topic1..topic2 2>actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '--advance with invalid commit-ish' '
+       cat >expect <<-EOF &&
+       fatal: ${SQ}refs/not-valid${SQ} is not a valid commit-ish
+       EOF
+       test_must_fail git replay --advance=refs/not-valid topic1..topic2 2>actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'using replay to rebase two branches, one on top of other' '
        git replay --ref-action=print --onto main topic1..topic2 >result &&