diff options
| author | Stefan Beller <sbeller@google.com> | 2016-03-29 18:27:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-30 13:03:57 -0700 |
| commit | ea2fa1040d14f1b7aab8fd78cc3ff4d41abc57a1 (patch) | |
| tree | 6a5a4c4b379aa76680d16a485a1ab8fcd81afdc9 /t/t7407-submodule-foreach.sh | |
| parent | 90f7b16b3adc78d4bbabbd426fb69aa78c714f71 (diff) | |
| download | git-ea2fa1040d14f1b7aab8fd78cc3ff4d41abc57a1.tar.gz git-ea2fa1040d14f1b7aab8fd78cc3ff4d41abc57a1.tar.xz | |
submodule foreach: correct path display in recursive submodules
The `prefix` was put in front of the display path unconditionally.
This is wrong as any relative path computation would need to be at
the front, so include the prefix into the display path.
The new test replicates the previous test with the difference of executing
from a sub directory. By executing from a sub directory all we would
expect all displayed paths to be prefixed by '../'.
Prior to this patch the test would report
Entering 'nested1/nested2/../nested3'
instead of the expected
Entering '../nested1/nested2/nested3'
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7407-submodule-foreach.sh')
| -rwxr-xr-x | t/t7407-submodule-foreach.sh | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index 7ca10b860..776b34950 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -178,6 +178,26 @@ test_expect_success 'test messages from "foreach --recursive"' ' ' cat > expect <<EOF +Entering '../nested1' +Entering '../nested1/nested2' +Entering '../nested1/nested2/nested3' +Entering '../nested1/nested2/nested3/submodule' +Entering '../sub1' +Entering '../sub2' +Entering '../sub3' +EOF + +test_expect_success 'test messages from "foreach --recursive" from subdirectory' ' + ( + cd clone2 && + mkdir untracked && + cd untracked && + git submodule foreach --recursive >../../actual + ) && + test_i18ncmp expect actual +' + +cat > expect <<EOF nested1-nested1 nested2-nested2 nested3-nested3 |