From: René Scharfe <redacted>
Date: Thu, 31 Dec 2020 23:55:12 +0000 (+0100)
Subject: rebase: verify commit parameter
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ca5120c339de883c3f22161316416c91655651ab;p=git.git

rebase: verify commit parameter

If the user specifies a base commit to switch to, check if it actually
references a commit right away to avoid getting confused later on when
it turns out to be an invalid object.

Reported-by: LeSeulArtichaut <redacted>
Signed-off-by: René Scharfe <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index eeca53382f..d0f112ffc2 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1906,7 +1906,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			die_if_checked_out(buf.buf, 1);
 			options.head_name = xstrdup(buf.buf);
 		/* If not is it a valid ref (branch or commit)? */
-		} else if (!get_oid(branch_name, &options.orig_head))
+		} else if (!get_oid(branch_name, &options.orig_head) &&
+			   lookup_commit_reference(the_repository,
+						   &options.orig_head))
 			options.head_name = NULL;
 		else
 			die(_("fatal: no such branch/commit '%s'"),