From 967d7f898c30bad41824c3f77962266b7cd7be32 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Wed, 10 Aug 2016 10:56:07 -0700 Subject: [PATCH] t7406: fix breakage on OSX On OSX `wc` prefixes the output of numbers with whitespace, such that the `commit_count` would be "SP ". When using that in git submodule update --init --depth=$commit_count the depth would be empty and the number is interpreted as the pathspec. Fix this by not using `wc` and rather instruct rev-list to count. Another way to fix this is to remove the `=` sign after the `--depth` argument as then we are allowed to have more than just one whitespace between `--depth` and the actual number. Prefer the solution of rev-list counting as that is expected to be slightly faster and more self-contained within Git. Reported-by: Lars Schneider Helped-by: Junio C Hamano , Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- t/t7406-submodule-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index d7983cf09f..64f322c4cc 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -877,7 +877,7 @@ test_expect_success 'submodule update clone shallow submodule' ' test_when_finished "rm -rf super3" && first=$(git -C cloned submodule status submodule |cut -c2-41) && second=$(git -C submodule rev-parse HEAD) && - commit_count=$(git -C submodule rev-list $first^..$second | wc -l) && + commit_count=$(git -C submodule rev-list --count $first^..$second) && git clone cloned super3 && pwd=$(pwd) && ( -- 2.11.4.GIT