undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ag/rebase-remove-redundant-code'

Browse Source 
Code reduction.

* ag/rebase-remove-redundant-code:
  builtin/rebase: remove a call to get_oid() on `options.switch_to'
This commit is contained in:
Junio C Hamano 2020-03-05 10:43:04 -08:00
commit a6b4709302
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/rebase.c
View File

@ -2158,19 +2158,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (!(options.flags & REBASE_FORCE)) { if (!(options.flags & REBASE_FORCE)) {
/* Lazily switch to the target branch if needed... */ /* Lazily switch to the target branch if needed... */
if (options.switch_to) { 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_reset(&buf);
strbuf_addf(&buf, "%s: checkout %s", strbuf_addf(&buf, "%s: checkout %s",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT), getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
options.switch_to); options.switch_to);
if (reset_head(&oid, "checkout", if (reset_head(&options.orig_head, "checkout",
options.head_name, options.head_name,
RESET_HEAD_RUN_POST_CHECKOUT_HOOK, RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
NULL, buf.buf) < 0) { NULL, buf.buf) < 0) {