summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7ee9066)
raw | patch | inline | side by side (parent: 7ee9066)
author | Miklos Vajna <vmiklos@frugalware.org> | |
Sat, 5 Jan 2008 04:06:48 +0000 (05:06 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 5 Jan 2008 08:07:57 +0000 (00:07 -0800) |
As pointed out by Junio, it's unnecessary to use "grep -E" and ".+" when we can
just use "grep" and "..*".
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
just use "grep" and "..*".
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7001-mv.sh | patch | blob | history |
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 8b43fb5a27af181e30a4fd125260174b7b49e3c0..b730c900b18543cd363ceaeb2dc6f6681c61524d 100755 (executable)
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
test_expect_success \
'checking the commit' \
'git diff-tree -r -M --name-status HEAD^ HEAD | \
- grep -E "^R100.+path0/COPYING.+path1/COPYING"'
+ grep "^R100..*path0/COPYING..*path1/COPYING"'
test_expect_success \
'moving the file back into subdirectory' \
test_expect_success \
'checking the commit' \
'git diff-tree -r -M --name-status HEAD^ HEAD | \
- grep -E "^R100.+path1/COPYING.+path0/COPYING"'
+ grep "^R100..*path1/COPYING..*path0/COPYING"'
test_expect_success \
'adding another file' \
test_expect_success \
'checking the commit' \
'git diff-tree -r -M --name-status HEAD^ HEAD | \
- grep -E "^R100.+path0/COPYING.+path2/COPYING" &&
+ grep "^R100..*path0/COPYING..*path2/COPYING" &&
git diff-tree -r -M --name-status HEAD^ HEAD | \
- grep -E "^R100.+path0/README.+path2/README"'
+ grep "^R100..*path0/README..*path2/README"'
test_expect_success \
'succeed when source is a prefix of destination' \
test_expect_success \
'checking the commit' \
'git diff-tree -r -M --name-status HEAD^ HEAD | \
- grep -E "^R100.+path2/COPYING.+path1/path2/COPYING" &&
+ grep "^R100..*path2/COPYING..*path1/path2/COPYING" &&
git diff-tree -r -M --name-status HEAD^ HEAD | \
- grep -E "^R100.+path2/README.+path1/path2/README"'
+ grep "^R100..*path2/README..*path1/path2/README"'
test_expect_failure \
'do not move directory over existing directory' \