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

Merge branch 'rs/worktree-use-strbuf-absolute-path' into maint 

Code simplification.

* rs/worktree-use-strbuf-absolute-path:
  worktree: use strbuf_add_absolute_path() directly
maint
Junio C Hamano 9 years ago
parent
2f8c654edb fd2e7dafde
commit
5131967e4a
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      worktree.c

4
worktree.c
Unescape 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, "/.");
} }



Write Preview
Loading…
Cancel
Save