summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2015-07-06 13:30:47 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-06 11:07:44 -0700
commit3c3e7f5b57f94b8f5fcba5042cf2412625c24d4a (patch)
tree2aed9c02ffd00f8edd238a1744f012d9c40551ae /builtin/checkout.c
parentcheckout: relocate --to's "no branch specified" check (diff)
downloadtgif-3c3e7f5b57f94b8f5fcba5042cf2412625c24d4a.tar.xz
checkout: prepare_linked_checkout: drop now-unused 'new' argument
The only references to 'new' were folded out by the last two patches. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 162c822263..134b6d65fd 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -854,8 +854,7 @@ static void remove_junk_on_signal(int signo)
raise(signo);
}
-static int prepare_linked_checkout(const struct checkout_opts *opts,
- struct branch_info *new)
+static int prepare_linked_checkout(const struct checkout_opts *opts)
{
struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT;
@@ -1304,7 +1303,7 @@ static int checkout_branch(struct checkout_opts *opts,
if (opts->new_worktree) {
if (!new->commit)
die(_("no branch specified"));
- return prepare_linked_checkout(opts, new);
+ return prepare_linked_checkout(opts);
}
if (!new->commit && opts->new_branch) {