mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7401: make indentation consistent

Browse Source 
Only leading whitespace is changed in this patch.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
John Keeping
2013-06-16 15:18:13 +01:00
committed by Junio C Hamano
parent edca415256
commit 8120e421bb
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
t/t7401-submodule-summary.sh
View File

@ -76,8 +76,8 @@ head3=$(
) )
test_expect_success 'modified submodule(backward)' " test_expect_success 'modified submodule(backward)' "
git submodule summary >actual && git submodule summary >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head2...$head3 (2): * sm1 $head2...$head3 (2):
< Add foo3 < Add foo3
< Add foo2 < Add foo2
@ -89,8 +89,8 @@ EOF
head4=$(add_file sm1 foo4 foo5) && head4=$(add_file sm1 foo4 foo5) &&
head4_full=$(GIT_DIR=sm1/.git git rev-parse --verify HEAD) head4_full=$(GIT_DIR=sm1/.git git rev-parse --verify HEAD)
test_expect_success 'modified submodule(backward and forward)' " test_expect_success 'modified submodule(backward and forward)' "
git submodule summary >actual && git submodule summary >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head2...$head4 (4): * sm1 $head2...$head4 (4):
> Add foo5 > Add foo5
> Add foo4 > Add foo4
@ -102,15 +102,15 @@ EOF
" "
test_expect_success '--summary-limit' " test_expect_success '--summary-limit' "
git submodule summary -n 3 >actual && git submodule summary -n 3 >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head2...$head4 (4): * sm1 $head2...$head4 (4):
> Add foo5 > Add foo5
> Add foo4 > Add foo4
< Add foo3 < Add foo3
EOF EOF
test_cmp expected actual test_cmp expected actual
" "
commit_file sm1 && commit_file sm1 &&
@ -122,8 +122,8 @@ rm -f sm1 &&
mv sm1-bak sm1 mv sm1-bak sm1
test_expect_success 'typechanged submodule(submodule->blob), --cached' " test_expect_success 'typechanged submodule(submodule->blob), --cached' "
git submodule summary --cached >actual && git submodule summary --cached >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head4(submodule)->$head5(blob) (3): * sm1 $head4(submodule)->$head5(blob) (3):
< Add foo5 < Add foo5
@ -132,59 +132,59 @@ EOF
" "
test_expect_success 'typechanged submodule(submodule->blob), --files' " test_expect_success 'typechanged submodule(submodule->blob), --files' "
git submodule summary --files >actual && git submodule summary --files >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head5(blob)->$head4(submodule) (3): * sm1 $head5(blob)->$head4(submodule) (3):
> Add foo5 > Add foo5
EOF EOF
test_i18ncmp actual expected test_i18ncmp actual expected
" "
rm -rf sm1 && rm -rf sm1 &&
git checkout-index sm1 git checkout-index sm1
test_expect_success 'typechanged submodule(submodule->blob)' " test_expect_success 'typechanged submodule(submodule->blob)' "
git submodule summary >actual && git submodule summary >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head4(submodule)->$head5(blob): * sm1 $head4(submodule)->$head5(blob):
EOF EOF
test_i18ncmp actual expected test_i18ncmp actual expected
" "
rm -f sm1 && rm -f sm1 &&
test_create_repo sm1 && test_create_repo sm1 &&
head6=$(add_file sm1 foo6 foo7) head6=$(add_file sm1 foo6 foo7)
test_expect_success 'nonexistent commit' " test_expect_success 'nonexistent commit' "
git submodule summary >actual && git submodule summary >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head4...$head6: * sm1 $head4...$head6:
Warn: sm1 doesn't contain commit $head4_full Warn: sm1 doesn't contain commit $head4_full
EOF EOF
test_i18ncmp actual expected test_i18ncmp actual expected
" "
commit_file commit_file
test_expect_success 'typechanged submodule(blob->submodule)' " test_expect_success 'typechanged submodule(blob->submodule)' "
git submodule summary >actual && git submodule summary >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head5(blob)->$head6(submodule) (2): * sm1 $head5(blob)->$head6(submodule) (2):
> Add foo7 > Add foo7
EOF EOF
test_i18ncmp expected actual test_i18ncmp expected actual
" "
commit_file sm1 && commit_file sm1 &&
rm -rf sm1 rm -rf sm1
test_expect_success 'deleted submodule' " test_expect_success 'deleted submodule' "
git submodule summary >actual && git submodule summary >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head6...0000000: * sm1 $head6...0000000:
EOF EOF
test_cmp expected actual test_cmp expected actual
" "
test_create_repo sm2 && test_create_repo sm2 &&
@ -192,43 +192,43 @@ head7=$(add_file sm2 foo8 foo9) &&
git add sm2 git add sm2
test_expect_success 'multiple submodules' " test_expect_success 'multiple submodules' "
git submodule summary >actual && git submodule summary >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head6...0000000: * sm1 $head6...0000000:
* sm2 0000000...$head7 (2): * sm2 0000000...$head7 (2):
> Add foo9 > Add foo9
EOF EOF
test_cmp expected actual test_cmp expected actual
" "
test_expect_success 'path filter' " test_expect_success 'path filter' "
git submodule summary sm2 >actual && git submodule summary sm2 >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm2 0000000...$head7 (2): * sm2 0000000...$head7 (2):
> Add foo9 > Add foo9
EOF EOF
test_cmp expected actual test_cmp expected actual
" "
commit_file sm2 commit_file sm2
test_expect_success 'given commit' " test_expect_success 'given commit' "
git submodule summary HEAD^ >actual && git submodule summary HEAD^ >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* sm1 $head6...0000000: * sm1 $head6...0000000:
* sm2 0000000...$head7 (2): * sm2 0000000...$head7 (2):
> Add foo9 > Add foo9
EOF EOF
test_cmp expected actual test_cmp expected actual
" "
test_expect_success '--for-status' " test_expect_success '--for-status' "
git submodule summary --for-status HEAD^ >actual && git submodule summary --for-status HEAD^ >actual &&
test_i18ncmp actual - <<EOF test_i18ncmp actual - <<EOF
# Submodule changes to be committed: # Submodule changes to be committed:
# #
# * sm1 $head6...0000000: # * sm1 $head6...0000000:
@ -240,14 +240,14 @@ EOF
" "
test_expect_success 'fail when using --files together with --cached' " test_expect_success 'fail when using --files together with --cached' "
test_must_fail git submodule summary --files --cached test_must_fail git submodule summary --files --cached
" "
test_expect_success 'should not fail in an empty repo' " test_expect_success 'should not fail in an empty repo' "
git init xyzzy && git init xyzzy &&
cd xyzzy && cd xyzzy &&
git submodule summary >output 2>&1 && git submodule summary >output 2>&1 &&
test_cmp output /dev/null test_cmp output /dev/null
" "
test_done test_done