From 240fc04f81fcc6c646ec08bfab4662bb09e44c50 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Tue, 21 Jan 2020 20:32:26 +0100 Subject: builtin/rebase: remove a call to get_oid() on `options.switch_to' When `options.switch_to' is set, `options.orig_head' is populated right after with the object name the ref/commit argument points at. Therefore, there is no need to parse `switch_to' again. Signed-off-by: Alban Gruin Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano diff --git a/builtin/rebase.c b/builtin/rebase.c index 8081741..d225c7f 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -2064,19 +2064,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (!(options.flags & REBASE_FORCE)) { /* Lazily switch to the target branch if needed... */ if (options.switch_to) { - struct object_id oid; - - if (get_oid(options.switch_to, &oid) < 0) { - ret = !!error(_("could not parse '%s'"), - options.switch_to); - goto cleanup; - } - strbuf_reset(&buf); strbuf_addf(&buf, "%s: checkout %s", getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.switch_to); - if (reset_head(&oid, "checkout", + if (reset_head(&options.orig_head, "checkout", options.head_name, RESET_HEAD_RUN_POST_CHECKOUT_HOOK, NULL, buf.buf) < 0) { -- cgit v0.10.2-6-g49f6