undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

worktree: use strbuf_add_absolute_path() directly

Browse Source 
absolute_path() is a wrapper for strbuf_add_absolute_path().  Call the
latter directly for adding absolute paths to a strbuf.  That's shorter
and avoids an extra string copy.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2016-07-09 17:43:59 +02:00 committed by Junio C Hamano
parent 5c9159de87
commit fd2e7dafde
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worktree.c
View File

@ -80,7 +80,7 @@ static struct worktree *get_main_worktree(void)
int is_bare = 0; int is_bare = 0;
int is_detached = 0; int is_detached = 0;
strbuf_addstr(&worktree_path, absolute_path(get_git_common_dir())); strbuf_add_absolute_path(&worktree_path, get_git_common_dir());
is_bare = !strbuf_strip_suffix(&worktree_path, "/.git"); is_bare = !strbuf_strip_suffix(&worktree_path, "/.git");
if (is_bare) if (is_bare)
strbuf_strip_suffix(&worktree_path, "/."); strbuf_strip_suffix(&worktree_path, "/.");
@ -125,7 +125,7 @@ static struct worktree *get_linked_worktree(const char *id)
strbuf_rtrim(&worktree_path); strbuf_rtrim(&worktree_path);
if (!strbuf_strip_suffix(&worktree_path, "/.git")) { if (!strbuf_strip_suffix(&worktree_path, "/.git")) {
strbuf_reset(&worktree_path); strbuf_reset(&worktree_path);
strbuf_addstr(&worktree_path, absolute_path(".")); strbuf_add_absolute_path(&worktree_path, ".");
strbuf_strip_suffix(&worktree_path, "/."); strbuf_strip_suffix(&worktree_path, "/.");
} }