Git Mailing List Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v1] builtin/rebase: remove a call to get_oid() on `options.switch_to'
@ 2020-01-21 19:32 Alban Gruin
  2020-01-22 14:00 ` Johannes Schindelin
  2020-01-22 20:47 ` Junio C Hamano
  0 siblings, 2 replies; 4+ messages in thread
From: Alban Gruin @ 2020-01-21 19:32 UTC (permalink / raw)
  To: git, phillip.wood, Johannes Schindelin, Junio C Hamano; +Cc: Alban Gruin

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@gmail.com>
---
 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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-21 19:32 [PATCH v1] builtin/rebase: remove a call to get_oid() on `options.switch_to' Alban Gruin
2020-01-22 14:00 ` Johannes Schindelin
2020-01-22 20:47 ` Junio C Hamano
2020-02-14 20:43   ` Alban Gruin

Git Mailing List Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/git/0 git/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 git git/ https://lore.kernel.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.git


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git