summaryrefslogtreecommitdiff
path: root/t/t7406-submodule-update.sh
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-08-08 16:31:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-08 17:52:55 (GMT)
commit602813cff3798f63b7f1f8c9a362e4da05772cad (patch)
tree30f145fc9ed9d3f124a3473ab4f52fbd91ec5aa3 /t/t7406-submodule-update.sh
parent0df90bdd12f57b03ac3ff7d16926c56a8f3d4682 (diff)
downloadgit-602813cff3798f63b7f1f8c9a362e4da05772cad.zip
git-602813cff3798f63b7f1f8c9a362e4da05772cad.tar.gz
git-602813cff3798f63b7f1f8c9a362e4da05772cad.tar.bz2
t7406: simplify by using diff --name-only instead of diff --raw
We can get rid of some quoted tabs and make a few tests slightly easier to read and edit by just asking for the names of the files modified, since that's all these tests were interested in anyway. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7406-submodule-update.sh')
-rwxr-xr-xt/t7406-submodule-update.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index ccdc2f9..f821b01 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -579,9 +579,9 @@ test_expect_success 'submodule update - update=none in .git/config' '
git checkout master &&
compare_head
) &&
- git diff --raw | grep " submodule" &&
+ git diff --name-only | grep ^submodule$ &&
git submodule update &&
- git diff --raw | grep " submodule" &&
+ git diff --name-only | grep ^submodule$ &&
(cd submodule &&
compare_head
) &&
@@ -597,10 +597,10 @@ test_expect_success 'submodule update - update=none in .git/config but --checkou
git checkout master &&
compare_head
) &&
- git diff --raw | grep " submodule" &&
+ git diff --name-only | grep ^submodule$ &&
git submodule update --checkout &&
- git diff --raw >out &&
- ! grep " submodule" out &&
+ git diff --name-only >out &&
+ ! grep ^submodule$ out &&
(cd submodule &&
test_must_fail compare_head
) &&