]> git.ipfire.org Git - thirdparty/git.git/commit - git-submodule.sh
submodule foreach: correct path display in recursive submodules
authorStefan Beller <sbeller@google.com>
Wed, 30 Mar 2016 01:27:41 +0000 (18:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Mar 2016 20:03:57 +0000 (13:03 -0700)
commitea2fa1040d14f1b7aab8fd78cc3ff4d41abc57a1
tree6a5a4c4b379aa76680d16a485a1ab8fcd81afdc9
parent90f7b16b3adc78d4bbabbd426fb69aa78c714f71
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>
git-submodule.sh
t/t7407-submodule-foreach.sh