diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-31 18:57:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-31 18:57:32 -0700 |
| commit | b35acb53458d0f99ba2400b902980b35e5acc2d3 (patch) | |
| tree | 2e599a9af18af3b62ce52318b2759faa7d92f311 /t/t7400-submodule-basic.sh | |
| parent | 4db0d0d1ba94c08f9476c7adff61375a752b154d (diff) | |
| parent | d5b66299040969706dd675c021f4336a26a6cc82 (diff) | |
| download | git-b35acb53458d0f99ba2400b902980b35e5acc2d3.tar.gz git-b35acb53458d0f99ba2400b902980b35e5acc2d3.tar.xz | |
Merge branch 'maint'
* maint:
Break down no-lstat() condition checks in verify_uptodate()
t7400: fix bogus test failure with symlinked trash
Documentation: clarify the invalidated tree entry format
Diffstat (limited to 't/t7400-submodule-basic.sh')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 5afe6ccd7..14dc92723 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -47,8 +47,10 @@ test_expect_success 'setup - repository to add submodules to' ' ' # The 'submodule add' tests need some repository to add as a submodule. -# The trash directory is a good one as any. -submodurl=$TRASH_DIRECTORY +# The trash directory is a good one as any. We need to canonicalize +# the name, though, as some tests compare it to the absolute path git +# generates, which will expand symbolic links. +submodurl=$(pwd -P) listbranches() { git for-each-ref --format='%(refname)' 'refs/heads/*' |