summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Michał Kiedrowicz <michal.kiedrowicz@gmail.com>2011-05-27 00:43:59 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-29 23:58:50 -0700
commitd0042abe14b3aece87595d365d6eba84c3e53327 (patch)
treeeb324e1b9d5f1fb3792db2f7142e9cf9cc0dcea8 /t/t7610-mergetool.sh
parentgit-grep: Update tests (mainly for -P) (diff)
downloadtgif-d0042abe14b3aece87595d365d6eba84c3e53327.tar.xz
git-grep: Fix problems with recently added tests
Brian Gernhardt reported that test 'git grep -E -F -G a\\+b' fails on OS X 10.6.7. This is because I assumed \+ is part of BRE, which isn't true on all platforms. The easiest way to make this test pass is to just update expected output, but that would make the test pointless. Its real purpose is to check whether 'git grep -E -F -G' is different from 'git grep -E -G -F'. To check that, let's change pattern to "a+b*c". This should return different match for -G, -F and -E. I also made two small tweaks to the tests. First, I added path "ab" to all calls to future-proof tests. Second, I updated last two tests to better show that 'git grep -P -E' is different from 'git grep -E -P'. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions