checkout: prepare_linked_checkout: drop now-unused 'new' argument

sunshineco · gitster · commit 3c3e7f5b57f9 · 2015-07-06T11:07:44.000-07:00
The only references to 'new' were folded out by the last two patches.

Signed-off-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -854,8 +854,7 @@ static void remove_junk_on_signal(int signo)`
`854`	`854`	`raise(signo);`
`855`	`855`	`}`
`856`	`856`
`857`		`-static int prepare_linked_checkout(const struct checkout_opts *opts,`
`858`		`- struct branch_info *new)`
	`857`	`+static int prepare_linked_checkout(const struct checkout_opts *opts)`
`859`	`858`	`{`
`860`	`859`	`struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;`
`861`	`860`	`struct strbuf sb = STRBUF_INIT;`
`@@ -1304,7 +1303,7 @@ static int checkout_branch(struct checkout_opts *opts,`
`1304`	`1303`	`if (opts->new_worktree) {`
`1305`	`1304`	`if (!new->commit)`
`1306`	`1305`	`die(_("no branch specified"));`
`1307`		`- return prepare_linked_checkout(opts, new);`
	`1306`	`+ return prepare_linked_checkout(opts);`
`1308`	`1307`	`}`
`1309`	`1308`
`1310`	`1309`	`if (!new->commit && opts->new_branch) {`