diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-03 14:50:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-09 23:21:29 -0700 |
| commit | 34a4ae55b260bbd1520d6a7c6718b4de2d5c7632 (patch) | |
| tree | 7c1c93cc63969f00dacb03d11edc4a61de5c8165 /t | |
| parent | 918d4e1c907983d26b0c4d82d7f7abff4dbec4e5 (diff) | |
| download | git-34a4ae55b260bbd1520d6a7c6718b4de2d5c7632.tar.gz git-34a4ae55b260bbd1520d6a7c6718b4de2d5c7632.tar.xz | |
log --grep: use the same helper to set -E/-F options as "git grep"
The command line option parser for "git log -F -E --grep='<ere>'"
did not flip the "fixed" bit, violating the general "last option
wins" principle among conflicting options.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4202-log.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 924ba536c..e6537abe1 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -230,6 +230,12 @@ test_expect_success 'log --grep -i' ' test_cmp expect actual ' +test_expect_success 'log -F -E --grep=<ere> uses ere' ' + echo second >expect && + git log -1 --pretty="tformat:%s" -F -E --grep=s.c.nd >actual && + test_cmp expect actual +' + cat > expect <<EOF * Second * sixth |