threads / patch / 52876

patchworktree: drop unused code from get_main_worktree()

Subject: [PATCH] worktree: drop unused code from get_main_worktree()

## tl;dr

3 messages between Feb 24, 2020 and Feb 24, 2020. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Eric Sunshine· Feb 24, 2020, 01:59 UTC · lore

This code has been unused since fa099d2322 (worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe(), 2017-04-24), so drop it.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---

Just something I noticed while reviewing a patch[1] on the mailing list.

[1]: https://lore.kernel.org/git/8718facbc951614f19407afa6ca8d6110507483d.1582484231.git.gitgitgadget@gmail.com/

 worktree.c | 4 ----
 1 file changed, 4 deletions(-)

Show changes to worktree.c +0 −4

diff --git a/worktree.c b/worktree.c
index 5b4793caa3..33c2655534 100644
--- a/worktree.c
+++ b/worktree.c
@@ -47,15 +47,12 @@ static void add_head_info(struct worktree *wt)
 static struct worktree *get_main_worktree(void)
 {
 	struct worktree *worktree = NULL;
-	struct strbuf path = STRBUF_INIT;
 	struct strbuf worktree_path = STRBUF_INIT;
 
 	strbuf_add_absolute_path(&worktree_path, get_git_common_dir());
 	if (!strbuf_strip_suffix(&worktree_path, "/.git"))
 		strbuf_strip_suffix(&worktree_path, "/.");
 
-	strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
-
 	worktree = xcalloc(1, sizeof(*worktree));
 	worktree->path = strbuf_detach(&worktree_path, NULL);
 	/*
@@ -69,7 +66,6 @@ static struct worktree *get_main_worktree(void)
 		is_bare_repository();
 	add_head_info(worktree);
 
-	strbuf_release(&path);
 	strbuf_release(&worktree_path);
 	return worktree;
 }

-- 
2.25.1.526.gf05a752211

Jeff King· Feb 24, 2020, 06:40 UTC · re: Eric Sunshine · lore

Re: [PATCH] worktree: drop unused code from get_main_worktree()

On Sun, Feb 23, 2020 at 08:59:35PM -0500, Eric Sunshine wrote:

> This code has been unused since fa099d2322 (worktree.c: kill parse_ref()
> in favor of refs_resolve_ref_unsafe(), 2017-04-24), so drop it.

Looks obviously correct, unless we are depending on some side effect of get_git_common_dir(). And if we are, then that should be fixed. ;)

-Peff

Junio C Hamano· Feb 24, 2020, 20:20 UTC · re: Jeff King · lore

Re: [PATCH] worktree: drop unused code from get_main_worktree()

Jeff King <peff@peff.net> writes:

Show 7 quoted lines

> On Sun, Feb 23, 2020 at 08:59:35PM -0500, Eric Sunshine wrote:
>
>> This code has been unused since fa099d2322 (worktree.c: kill parse_ref()
>> in favor of refs_resolve_ref_unsafe(), 2017-04-24), so drop it.
>
> Looks obviously correct, unless we are depending on some side effect of
> get_git_common_dir(). And if we are, then that should be fixed. ;)

Heh, get_git_common_dir() could be implemented to have some "setup" kind of side effect for the first call to it, but what is removed is the second call ;-) Besides, the body of get_git_common_dir() is a mere three lines that does not have any side effect, so...