development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-19 08:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/fail-show-toplevel-outside-working-tree'

Browse source 
"git rev-parse --show-toplevel" run outside of any working tree did
not error out, which has been corrected.

* jk/fail-show-toplevel-outside-working-tree:
  rev-parse: make --show-toplevel without a worktree an error
This commit is contained in:
Junio C Hamano 2019-12-05 12:52:45 -08:00
parent cf91c31688 2d92ab32fd
commit 36fd304d81
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Documentation/git-rev-parse.txt
View file

@ -262,7 +262,8 @@ print a message to stderr and exit with nonzero status.
directory.
--show-toplevel::
Show the absolute path of the top-level directory.
Show the absolute path of the top-level directory of the working
tree. If there is no working tree, report an error.
--show-superproject-working-tree::
Show the absolute path of the root of the superproject's

2
builtin/rev-parse.c
View file

@ -803,6 +803,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
const char *work_tree = get_git_work_tree();
if (work_tree)
puts(work_tree);
else
die("this operation must be run in a work tree");
continue;
}
if (!strcmp(arg, "--show-superproject-working-tree")) {

10
t/t1500-rev-parse.sh
View file

@ -146,6 +146,16 @@ test_expect_success 'rev-parse --show-object-format in repo' '
grep "unknown mode for --show-object-format: squeamish-ossifrage" err
'
test_expect_success '--show-toplevel from subdir of working tree' '
pwd >expect &&
git -C sub/dir rev-parse --show-toplevel >actual &&
test_cmp expect actual
'
test_expect_success '--show-toplevel from inside .git' '
test_must_fail git -C .git rev-parse --show-toplevel
'
test_expect_success 'showing the superproject correctly' '
git rev-parse --show-superproject-working-tree >out &&
test_must_be_empty out &&