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

Merge branch 'nd/git-common-dir-fix' into maint

Browse Source 
"git rev-parse --git-common-dir" used in the worktree feature
misbehaved when run from a subdirectory.

* nd/git-common-dir-fix:
  rev-parse: take prefix into account in --git-common-dir
This commit is contained in:
Junio C Hamano 2016-03-10 11:13:39 -08:00
commit 9c17ccaa49
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/rev-parse.c
View File

@ -763,7 +763,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
continue; continue;
} }
if (!strcmp(arg, "--git-common-dir")) { if (!strcmp(arg, "--git-common-dir")) {
puts(get_git_common_dir()); const char *pfx = prefix ? prefix : "";
puts(prefix_filename(pfx, strlen(pfx), get_git_common_dir()));
continue; continue;
} }
if (!strcmp(arg, "--resolve-git-dir")) { if (!strcmp(arg, "--resolve-git-dir")) {

10
t/t2027-worktree-list.sh
View File

@ -8,6 +8,16 @@ test_expect_success 'setup' '
test_commit init test_commit init
' '
test_expect_success 'rev-parse --git-common-dir on main worktree' '
git rev-parse --git-common-dir >actual &&
echo .git >expected &&
test_cmp expected actual &&
mkdir sub &&
git -C sub rev-parse --git-common-dir >actual2 &&
echo sub/.git >expected2 &&
test_cmp expected2 actual2
'
test_expect_success '"list" all worktrees from main' ' test_expect_success '"list" all worktrees from main' '
echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect && echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
test_when_finished "rm -rf here && git worktree prune" && test_when_finished "rm -rf here && git worktree prune" &&