File tree Expand file tree Collapse file tree 6 files changed +16
-16
lines changed Expand file tree Collapse file tree 6 files changed +16
-16
lines changed Original file line number Diff line number Diff line change @@ -291,7 +291,7 @@ test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" '
291291 git reset --hard &&
292292 touch fo\[ou\]bar foobar &&
293293 git add ' \' ' fo\[ou\]bar' \' ' &&
294- git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
294+ git ls-files fo\[ou\]bar | grep -F fo\[ou\]bar &&
295295 ! ( git ls-files foobar | grep foobar )
296296'
297297
Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ test_expect_success 'result is really identical' '
4949test_expect_success ' rewrite bare repository identically' '
5050 (git config core.bare true && cd .git &&
5151 git filter-branch branch > filter-output 2>&1 &&
52- ! fgrep fatal filter-output)
52+ ! grep fatal filter-output)
5353'
5454git config core.bare false
5555test_expect_success ' result is really identical' '
@@ -506,7 +506,7 @@ test_expect_success 'rewrite repository including refs that point at non-commit
506506 git tag -a -m "tag to a tree" treetag $new_tree &&
507507 git reset --hard HEAD &&
508508 git filter-branch -f -- --all >filter-output 2>&1 &&
509- ! fgrep fatal filter-output
509+ ! grep fatal filter-output
510510'
511511
512512test_expect_success ' filter-branch handles ref deletion' '
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ test_expect_success 'SVN-side change outside of .git' '
3535 echo b >> a &&
3636 svn_cmd commit -m "SVN-side change outside of .git" &&
3737 svn_cmd up &&
38- svn_cmd log -v | fgrep "SVN-side change outside of .git"
38+ svn_cmd log -v | grep -F "SVN-side change outside of .git"
3939 )
4040'
4141
@@ -59,7 +59,7 @@ test_expect_success 'SVN-side change inside of .git' '
5959 svn_cmd add --force .git &&
6060 svn_cmd commit -m "SVN-side change inside of .git" &&
6161 svn_cmd up &&
62- svn_cmd log -v | fgrep "SVN-side change inside of .git"
62+ svn_cmd log -v | grep -F "SVN-side change inside of .git"
6363 )
6464'
6565
@@ -82,7 +82,7 @@ test_expect_success 'SVN-side change in and out of .git' '
8282 git commit -m "add a inside an SVN repo" &&
8383 svn_cmd commit -m "SVN-side change in and out of .git" &&
8484 svn_cmd up &&
85- svn_cmd log -v | fgrep "SVN-side change in and out of .git"
85+ svn_cmd log -v | grep -F "SVN-side change in and out of .git"
8686 )
8787'
8888
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ test_expect_success 'init+fetch an SVN repository with ignored www directory' '
4343test_expect_success ' verify ignore-paths config saved by clone' '
4444 (
4545 cd g &&
46- git config --get svn-remote.svn.ignore-paths | fgrep " www"
46+ git config --get svn-remote.svn.ignore-paths | grep www
4747 )
4848'
4949
@@ -53,7 +53,7 @@ test_expect_success 'SVN-side change outside of www' '
5353 echo b >> qqq/test_qqq.txt &&
5454 svn_cmd commit -m "SVN-side change outside of www" &&
5555 svn_cmd up &&
56- svn_cmd log -v | fgrep "SVN-side change outside of www"
56+ svn_cmd log -v | grep "SVN-side change outside of www"
5757 )
5858'
5959
@@ -85,7 +85,7 @@ test_expect_success 'SVN-side change inside of ignored www' '
8585 echo zaq >> www/test_www.txt &&
8686 svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
8787 svn_cmd up &&
88- svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"
88+ svn_cmd log -v | grep -F "SVN-side change inside of www/test_www.txt"
8989 )
9090'
9191
@@ -118,7 +118,7 @@ test_expect_success 'SVN-side change in and out of ignored www' '
118118 echo ygg >> qqq/test_qqq.txt &&
119119 svn_cmd commit -m "SVN-side change in and out of ignored www" &&
120120 svn_cmd up &&
121- svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"
121+ svn_cmd log -v | grep "SVN-side change in and out of ignored www"
122122 )
123123'
124124
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ test_expect_success 'fetch fails on modified hidden file' '
4343 git svn find-rev refs/remotes/git-svn > ../expect &&
4444 test_must_fail git svn fetch 2> ../errors &&
4545 git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
46- fgrep "not found in commit" errors &&
46+ grep "not found in commit" errors &&
4747 test_cmp expect expect2
4848'
4949
@@ -59,7 +59,7 @@ test_expect_success 'refetch succeeds not ignoring any files' '
5959 ( cd g &&
6060 git svn fetch &&
6161 git svn rebase &&
62- fgrep "mod hidden" hid/hid.txt
62+ grep "mod hidden" hid/hid.txt
6363 )
6464'
6565
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ test_expect_success 'init+fetch an SVN repository with included qqq directory' '
4545test_expect_success ' verify include-paths config saved by clone' '
4646 (
4747 cd g &&
48- git config --get svn-remote.svn.include-paths | fgrep " qqq"
48+ git config --get svn-remote.svn.include-paths | grep qqq
4949 )
5050'
5151
@@ -55,7 +55,7 @@ test_expect_success 'SVN-side change outside of www' '
5555 echo b >> qqq/test_qqq.txt &&
5656 svn_cmd commit -m "SVN-side change outside of www" &&
5757 svn_cmd up &&
58- svn_cmd log -v | fgrep "SVN-side change outside of www"
58+ svn_cmd log -v | grep "SVN-side change outside of www"
5959 )
6060'
6161
@@ -87,7 +87,7 @@ test_expect_success 'SVN-side change inside of ignored www' '
8787 echo zaq >> www/test_www.txt &&
8888 svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
8989 svn_cmd up &&
90- svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"
90+ svn_cmd log -v | grep "SVN-side change inside of www/test_www.txt"
9191 )
9292'
9393
@@ -120,7 +120,7 @@ test_expect_success 'SVN-side change in and out of included qqq' '
120120 echo ygg >> qqq/test_qqq.txt &&
121121 svn_cmd commit -m "SVN-side change in and out of ignored www" &&
122122 svn_cmd up &&
123- svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"
123+ svn_cmd log -v | grep "SVN-side change in and out of ignored www"
124124 )
125125'
126126
You can’t perform that action at this time.
0 commit comments