Hi Alban,
On Tue, 21 Jan 2020, Alban Gruin wrote:
> When `options.switch_to' is set, `options.orig_head' is populated right
> after. Therefore, there is no need to parse `switch_to' again.
>
> Signed-off-by: Alban Gruin <alban.gruin@xxxxxxxxx>
ACK!
Dscho
> ---
> builtin/rebase.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 6154ad8fa5..16d2ec7ebc 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -2056,19 +2056,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) {
> --
> 2.24.1
>
>
