Updated with an improved test. Manish Goregaokar (1): submodule: fix 'submodule status' when called from a subdirectory builtin/submodule--helper.c | 3 ++- t/t7400-submodule-basic.sh | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) base-commit: 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-472%2FManishearth%2Fsubdir-status-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-472/Manishearth/subdir-status-v3 Pull-Request: https://github.com/gitgitgadget/git/pull/472 Range-diff vs v2: 1: e4c932bd09 ! 1: 8dcea6b399 submodule: fix 'submodule status' when called from a subdirectory @@ -41,18 +41,21 @@ + test_when_finished "rmdir addtest/subdir" && + ( + cd addtest && -+ git status > /tmp/foo && -+ git submodule status | awk "{print \$1}" >expected && + mkdir subdir && ++ git submodule status >output && ++ awk "{print \$1}" <output >expect && + cd subdir && -+ git submodule status | awk "{print \$1}" >../actual && -+ test_cmp ../expected ../actual && -+ git -C ../submod checkout @^ && -+ git submodule status | awk "{print \$1}" >../actual2 && ++ git submodule status >../output && ++ awk "{print \$1}" <../output >../actual && ++ test_cmp ../expect ../actual && ++ git -C ../submod checkout HEAD^ && ++ git submodule status >../output && ++ awk "{print \$1}" <../output >../actual2 && + cd .. && -+ git submodule status | awk "{print \$1}" >expected2 && -+ test_cmp actual2 expected2 && -+ test_must_fail test_cmp actual actual2 ++ git submodule status >output && ++ awk "{print \$1}" <output >expect2 && ++ test_cmp actual2 expect2 && ++ ! test_cmp actual actual2 + ) +' + -- gitgitgadget
