| Message ID | 20200224015935.19190-1-sunshine@sunshineco.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | worktree: drop unused code from get_main_worktree() | expand |
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
Jeff King <peff@peff.net> writes: > 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...
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; }
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(-)