diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 16:46:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 16:46:36 -0700 |
commit | 347c47e61e5daf1efb3503724a431e4316c6eb5b (patch) | |
tree | f5c0c4da1c77b79cfa2831cfa2a55956d7be7528 /t/t7401-submodule-summary.sh | |
parent | c2e0940b44ded03f0af02be95c35b231fea633c1 (diff) | |
parent | fd4ec4f2bb980ce07bb28d5823a95610f251d00b (diff) | |
download | git-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.gz |
Merge branch 'jl/maint-fix-test'
* jl/maint-fix-test:
Several tests: cd inside subshell instead of around
Conflicts:
t/t9600-cvsimport.sh
Diffstat (limited to 't/t7401-submodule-summary.sh')
-rwxr-xr-x | t/t7401-submodule-summary.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index cee319da0a..b5ad45f447 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -66,10 +66,10 @@ EOF " commit_file sm1 && -cd sm1 && +head3=$(cd sm1 && git reset --hard HEAD~2 >/dev/null && -head3=$(git rev-parse --verify HEAD | cut -c1-7) && -cd .. +git rev-parse --verify HEAD | cut -c1-7 +) test_expect_success 'modified submodule(backward)' " git submodule summary >actual && |