From: Elijah Newren Date: Wed, 8 Aug 2018 16:31:04 +0000 (-0700) Subject: t7406: simplify by using diff --name-only instead of diff --raw X-Git-Tag: v2.19.0-rc0~31^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/602813cff3798f63b7f1f8c9a362e4da05772cad 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index ccdc2f9039..f821b01f15 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 ) &&