global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 11:10:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mk/grep-pcre' into next

Browse Source 
* mk/grep-pcre:
  Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
  git-grep: update tests now regexp type is "last one wins"
This commit is contained in:
Junio C Hamano
2011-05-16 00:13:23 -07:00
parent 1a857915d6 a80dff2515
commit 0c6c25e550
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -2093,6 +2093,7 @@ GIT-BUILD-OPTIONS: FORCE
@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
ifdef GIT_TEST_CMP

16
t/t7810-grep.sh
View File

@@ -637,20 +637,4 @@ test_expect_success LIBPCRE 'grep -P -w pattern' '
test_cmp expected actual
'
test_expect_success LIBPCRE 'grep -P -F returns error' '
test_expect_code 128 git grep -P -F main
'
test_expect_success LIBPCRE 'grep -P -E returns error' '
test_expect_code 128 git grep -P -E main
'
test_expect_failure LIBPCRE 'grep -P -G returns error' '
test_expect_code 128 git grep -P -G main
'
test_expect_failure LIBPCRE 'grep -P -E -G returns error' '
test_expect_code 128 git grep -P -E -G main
'
test_done