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

tests: use test_cmp instead of piping to diff(1)

Browse Source 
Change submodule tests that piped to diff(1) to use test_cmp. The
resulting unified diff is easier to read.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2010-11-14 14:44:16 +00:00
committed by Junio C Hamano
parent 5649bd9a51
commit f8d186bba7
2 changed files with 94 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,11 +37,12 @@ head1=$(add_file sm1 foo1 foo2)
test_expect_success 'added submodule' "
git add sm1 &&
git submodule summary >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 0000000...$head1 (2):
> Add foo2
EOF
test_cmp expected actual
"
commit_file sm1 &&
@ -49,20 +50,22 @@ head2=$(add_file sm1 foo3)
test_expect_success 'modified submodule(forward)' "
git submodule summary >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head1...$head2 (1):
> Add foo3
EOF
test_cmp expected actual
"
test_expect_success 'modified submodule(forward), --files' "
git submodule summary --files >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head1...$head2 (1):
> Add foo3
EOF
test_cmp expected actual
"
commit_file sm1 &&
@ -74,19 +77,20 @@ head3=$(
test_expect_success 'modified submodule(backward)' "
git submodule summary >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head2...$head3 (2):
< Add foo3
< Add foo2
EOF
test_cmp expected actual
"
head4=$(add_file sm1 foo4 foo5) &&
head4_full=$(GIT_DIR=sm1/.git git rev-parse --verify HEAD)
test_expect_success 'modified submodule(backward and forward)' "
git submodule summary >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head2...$head4 (4):
> Add foo5
> Add foo4
@ -94,17 +98,19 @@ test_expect_success 'modified submodule(backward and forward)' "
< Add foo2
EOF
test_cmp expected actual
"
test_expect_success '--summary-limit' "
git submodule summary -n 3 >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head2...$head4 (4):
> Add foo5
> Add foo4
< Add foo3
EOF
test_cmp expected actual
"
commit_file sm1 &&
@ -117,30 +123,33 @@ mv sm1-bak sm1
test_expect_success 'typechanged submodule(submodule->blob), --cached' "
git submodule summary --cached >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head4(submodule)->$head5(blob) (3):
< Add foo5
EOF
test_cmp actual expected
"
test_expect_success 'typechanged submodule(submodule->blob), --files' "
git submodule summary --files >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head5(blob)->$head4(submodule) (3):
> Add foo5
EOF
test_cmp actual expected
"
rm -rf sm1 &&
git checkout-index sm1
test_expect_success 'typechanged submodule(submodule->blob)' "
git submodule summary >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head4(submodule)->$head5(blob):
EOF
test_cmp actual expected
"
rm -f sm1 &&
@ -148,31 +157,34 @@ test_create_repo sm1 &&
head6=$(add_file sm1 foo6 foo7)
test_expect_success 'nonexistent commit' "
git submodule summary >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head4...$head6:
Warn: sm1 doesn't contain commit $head4_full
EOF
test_cmp actual expected
"
commit_file
test_expect_success 'typechanged submodule(blob->submodule)' "
git submodule summary >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head5(blob)->$head6(submodule) (2):
> Add foo7
EOF
test_cmp expected actual
"
commit_file sm1 &&
rm -rf sm1
test_expect_success 'deleted submodule' "
git submodule summary >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head6...0000000:
EOF
test_cmp expected actual
"
test_create_repo sm2 &&
@ -181,34 +193,37 @@ git add sm2
test_expect_success 'multiple submodules' "
git submodule summary >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head6...0000000:
* sm2 0000000...$head7 (2):
> Add foo9
EOF
test_cmp expected actual
"
test_expect_success 'path filter' "
git submodule summary sm2 >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm2 0000000...$head7 (2):
> Add foo9
EOF
test_cmp expected actual
"
commit_file sm2
test_expect_success 'given commit' "
git submodule summary HEAD^ >actual &&
diff actual - <<-EOF
cat >expected <<-EOF &&
* sm1 $head6...0000000:
* sm2 0000000...$head7 (2):
> Add foo9
EOF
test_cmp expected actual
"
test_expect_success '--for-status' "