Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t7401: make indentation consistent
author
John Keeping
<john@keeping.me.uk>
Sun, 16 Jun 2013 14:18:13 +0000
(15:18 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 17 Jun 2013 20:30:01 +0000
(13:30 -0700)
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>
t/t7401-submodule-summary.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
edca415
)
diff --git
a/t/t7401-submodule-summary.sh
b/t/t7401-submodule-summary.sh
index 30b429e7dcbcd56af21ded67128aa18901133275..c32872658cab60cc3b7f830ec37bfa4795269915 100755
(executable)
--- a/
t/t7401-submodule-summary.sh
+++ b/
t/t7401-submodule-summary.sh
@@
-76,8
+76,8
@@
head3=$(
)
test_expect_success 'modified submodule(backward)' "
)
test_expect_success 'modified submodule(backward)' "
- git submodule summary >actual &&
- cat >expected <<-EOF &&
+
git submodule summary >actual &&
+
cat >expected <<-EOF &&
* sm1 $head2...$head3 (2):
< Add foo3
< Add foo2
* sm1 $head2...$head3 (2):
< Add foo3
< Add foo2
@@
-89,8
+89,8
@@
EOF
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)' "
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 &&
- cat >expected <<-EOF &&
+
git submodule summary >actual &&
+
cat >expected <<-EOF &&
* sm1 $head2...$head4 (4):
> Add foo5
> Add foo4
* sm1 $head2...$head4 (4):
> Add foo5
> Add foo4
@@
-102,15
+102,15
@@
EOF
"
test_expect_success '--summary-limit' "
"
test_expect_success '--summary-limit' "
- git submodule summary -n 3 >actual &&
- cat >expected <<-EOF &&
+
git submodule summary -n 3 >actual &&
+
cat >expected <<-EOF &&
* sm1 $head2...$head4 (4):
> Add foo5
> Add foo4
< Add foo3
EOF
* sm1 $head2...$head4 (4):
> Add foo5
> Add foo4
< Add foo3
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
test_expect_success 'typechanged submodule(submodule->blob), --cached' "
mv sm1-bak sm1
test_expect_success 'typechanged submodule(submodule->blob), --cached' "
- git submodule summary --cached >actual &&
- cat >expected <<-EOF &&
+
git submodule summary --cached >actual &&
+
cat >expected <<-EOF &&
* sm1 $head4(submodule)->$head5(blob) (3):
< Add foo5
* sm1 $head4(submodule)->$head5(blob) (3):
< 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 &&
- cat >expected <<-EOF &&
+
git submodule summary --files >actual &&
+
cat >expected <<-EOF &&
* sm1 $head5(blob)->$head4(submodule) (3):
> Add foo5
EOF
* sm1 $head5(blob)->$head4(submodule) (3):
> Add foo5
EOF
- test_i18ncmp actual expected
+
test_i18ncmp actual expected
"
rm -rf sm1 &&
git checkout-index sm1
test_expect_success 'typechanged submodule(submodule->blob)' "
"
rm -rf sm1 &&
git checkout-index sm1
test_expect_success 'typechanged submodule(submodule->blob)' "
- git submodule summary >actual &&
- cat >expected <<-EOF &&
+
git submodule summary >actual &&
+
cat >expected <<-EOF &&
* sm1 $head4(submodule)->$head5(blob):
EOF
* sm1 $head4(submodule)->$head5(blob):
EOF
- test_i18ncmp actual expected
+
test_i18ncmp actual expected
"
rm -f sm1 &&
test_create_repo sm1 &&
head6=$(add_file sm1 foo6 foo7)
test_expect_success 'nonexistent commit' "
"
rm -f sm1 &&
test_create_repo sm1 &&
head6=$(add_file sm1 foo6 foo7)
test_expect_success 'nonexistent commit' "
- git submodule summary >actual &&
- cat >expected <<-EOF &&
+
git submodule summary >actual &&
+
cat >expected <<-EOF &&
* sm1 $head4...$head6:
Warn: sm1 doesn't contain commit $head4_full
EOF
* sm1 $head4...$head6:
Warn: sm1 doesn't contain commit $head4_full
EOF
- test_i18ncmp actual expected
+
test_i18ncmp actual expected
"
commit_file
test_expect_success 'typechanged submodule(blob->submodule)' "
"
commit_file
test_expect_success 'typechanged submodule(blob->submodule)' "
- git submodule summary >actual &&
- cat >expected <<-EOF &&
+
git submodule summary >actual &&
+
cat >expected <<-EOF &&
* sm1 $head5(blob)->$head6(submodule) (2):
> Add foo7
EOF
* sm1 $head5(blob)->$head6(submodule) (2):
> Add foo7
EOF
- test_i18ncmp expected actual
+
test_i18ncmp expected actual
"
commit_file sm1 &&
rm -rf sm1
test_expect_success 'deleted submodule' "
"
commit_file sm1 &&
rm -rf sm1
test_expect_success 'deleted submodule' "
- git submodule summary >actual &&
- cat >expected <<-EOF &&
+
git submodule summary >actual &&
+
cat >expected <<-EOF &&
* sm1 $head6...0000000:
EOF
* sm1 $head6...0000000:
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
test_expect_success 'multiple submodules' "
git add sm2
test_expect_success 'multiple submodules' "
- git submodule summary >actual &&
- cat >expected <<-EOF &&
+
git submodule summary >actual &&
+
cat >expected <<-EOF &&
* sm1 $head6...0000000:
* sm2 0000000...$head7 (2):
> Add foo9
EOF
* sm1 $head6...0000000:
* sm2 0000000...$head7 (2):
> Add foo9
EOF
- test_cmp expected actual
+
test_cmp expected actual
"
test_expect_success 'path filter' "
"
test_expect_success 'path filter' "
- git submodule summary sm2 >actual &&
- cat >expected <<-EOF &&
+
git submodule summary sm2 >actual &&
+
cat >expected <<-EOF &&
* sm2 0000000...$head7 (2):
> Add foo9
EOF
* sm2 0000000...$head7 (2):
> Add foo9
EOF
- test_cmp expected actual
+
test_cmp expected actual
"
commit_file sm2
test_expect_success 'given commit' "
"
commit_file sm2
test_expect_success 'given commit' "
- git submodule summary HEAD^ >actual &&
- cat >expected <<-EOF &&
+
git submodule summary HEAD^ >actual &&
+
cat >expected <<-EOF &&
* sm1 $head6...0000000:
* sm2 0000000...$head7 (2):
> Add foo9
EOF
* sm1 $head6...0000000:
* sm2 0000000...$head7 (2):
> Add foo9
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 &&
- test_i18ncmp actual - <<EOF
+
git submodule summary --for-status HEAD^ >actual &&
+
test_i18ncmp actual - <<EOF
# Submodule changes to be committed:
#
# * sm1 $head6...0000000:
# Submodule changes to be committed:
#
# * 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 &&
- cd xyzzy &&
- git submodule summary >output 2>&1 &&
- test_cmp output /dev/null
+
git init xyzzy &&
+
cd xyzzy &&
+
git submodule summary >output 2>&1 &&
+
test_cmp output /dev/null
"
test_done
"
test_done