mirror of https://github.com/git/git.git
Merge branch 'es/worktree-code-cleanup'
Code cleanup. * es/worktree-code-cleanup: worktree: avoid dead-code in conditional
This commit is contained in:
commit
43f46d6da5
|
@ -50,9 +50,9 @@ static struct worktree *get_main_worktree(void)
|
||||||
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());
|
||||||
strbuf_strip_suffix(&worktree_path, "/.");
|
if (!strbuf_strip_suffix(&worktree_path, "/.git/.") && /* in .git */
|
||||||
if (!strbuf_strip_suffix(&worktree_path, "/.git"))
|
!strbuf_strip_suffix(&worktree_path, "/.git")) /* in worktree */
|
||||||
strbuf_strip_suffix(&worktree_path, "/.");
|
strbuf_strip_suffix(&worktree_path, "/."); /* in bare repo */
|
||||||
|
|
||||||
worktree = xcalloc(1, sizeof(*worktree));
|
worktree = xcalloc(1, sizeof(*worktree));
|
||||||
worktree->path = strbuf_detach(&worktree_path, NULL);
|
worktree->path = strbuf_detach(&worktree_path, NULL);
|
||||||
|
|
Loading…
Reference in New Issue