kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'es/worktree-cleanup' 

Code cleanup.

* es/worktree-cleanup:
  worktree: drop unused code from get_main_worktree()
maint
Junio C Hamano 2020-03-02 15:07:20 -08:00
parent 46703057c1 02bbbe9df9
commit 4cbf1a0e22
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worktree.c
View File

@ -47,15 +47,12 @@ static void add_head_info(struct worktree *wt)
static struct worktree *get_main_worktree(void) static struct worktree *get_main_worktree(void)
{ {
struct worktree *worktree = NULL; struct worktree *worktree = NULL;
struct strbuf path = STRBUF_INIT;
struct strbuf worktree_path = STRBUF_INIT; struct strbuf worktree_path = STRBUF_INIT;


strbuf_add_absolute_path(&worktree_path, get_git_common_dir()); strbuf_add_absolute_path(&worktree_path, get_git_common_dir());
if (!strbuf_strip_suffix(&worktree_path, "/.git")) if (!strbuf_strip_suffix(&worktree_path, "/.git"))
strbuf_strip_suffix(&worktree_path, "/."); strbuf_strip_suffix(&worktree_path, "/.");


strbuf_addf(&path, "%s/HEAD", get_git_common_dir());

worktree = xcalloc(1, sizeof(*worktree)); worktree = xcalloc(1, sizeof(*worktree));
worktree->path = strbuf_detach(&worktree_path, NULL); worktree->path = strbuf_detach(&worktree_path, NULL);
/* /*
@ -69,7 +66,6 @@ static struct worktree *get_main_worktree(void)
is_bare_repository(); is_bare_repository();
add_head_info(worktree); add_head_info(worktree);


strbuf_release(&path);
strbuf_release(&worktree_path); strbuf_release(&worktree_path);
return worktree; return worktree;
} }