diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:45 (GMT) |
| commit | 36fd304d819d412adf1ed81d6a983dabb28bfc9b (patch) | |
| tree | 7fc4343de532b086f9c3af1e04811d43ed3d6581 /t | |
| parent | cf91c316881188e3c8b4075ebb3ad10dda7345fb (diff) | |
| parent | 2d92ab32fd624349d308334befbf07adf9f179b9 (diff) | |
| download | git-36fd304d819d412adf1ed81d6a983dabb28bfc9b.zip git-36fd304d819d412adf1ed81d6a983dabb28bfc9b.tar.gz git-36fd304d819d412adf1ed81d6a983dabb28bfc9b.tar.bz2 | |
Merge branch 'jk/fail-show-toplevel-outside-working-tree'
"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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1500-rev-parse.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index 0177fd8..603019b 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -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 && |