Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
checkout: prepare_linked_checkout: drop now-unused 'new' argument
author
Eric Sunshine
<sunshine@sunshineco.com>
Mon, 6 Jul 2015 17:30:47 +0000
(13:30 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 6 Jul 2015 18:07:44 +0000
(11:07 -0700)
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>
builtin/checkout.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
9559ce8
)
diff --git
a/builtin/checkout.c
b/builtin/checkout.c
index 162c822263a7988e223b4bae654d61c2c6e2e641..134b6d65fd308641c5aadc07ddec7d04680c3b45 100644
(file)
--- a/
builtin/checkout.c
+++ b/
builtin/checkout.c
@@
-854,8
+854,7
@@
static void remove_junk_on_signal(int signo)
raise(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;
{
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"));
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) {
}
if (!new->commit && opts->new_branch) {