From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 18:36:25 +0000 (-0700)
Subject: Merge branch 'rj/test-regex'
X-Git-Tag: v1.8.0-rc0~76
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=efe0a206a24179bf085463ea88f8c95ebc7c4768;p=git.git

Merge branch 'rj/test-regex'

Git ships with a fall-back regexp implementation for platforms with
buggy regexp library; give people a tool to see if they should be
using it on their platform.

* rj/test-regex:
  test-regex: Add a test to check for a bug in the regex routines
---

efe0a206a24179bf085463ea88f8c95ebc7c4768
diff --cc .gitignore
index bb5c91e71,d284b058a..68fe46409
--- a/.gitignore
+++ b/.gitignore
@@@ -185,11 -180,11 +185,12 @@@
  /test-index-version
  /test-line-buffer
  /test-match-trees
 +/test-mergesort
  /test-mktemp
 -/test-obj-pool
  /test-parse-options
  /test-path-utils
+ /test-regex
 +/test-revision-walking
  /test-run-command
  /test-sha1
  /test-sigchain
diff --cc Makefile
index 66e82167e,d2b145b53..26b697d17
--- a/Makefile
+++ b/Makefile
@@@ -492,17 -472,18 +492,18 @@@ TEST_PROGRAMS_NEED_X += test-genrando
  TEST_PROGRAMS_NEED_X += test-index-version
  TEST_PROGRAMS_NEED_X += test-line-buffer
  TEST_PROGRAMS_NEED_X += test-match-trees
 +TEST_PROGRAMS_NEED_X += test-mergesort
  TEST_PROGRAMS_NEED_X += test-mktemp
 -TEST_PROGRAMS_NEED_X += test-obj-pool
  TEST_PROGRAMS_NEED_X += test-parse-options
  TEST_PROGRAMS_NEED_X += test-path-utils
+ TEST_PROGRAMS_NEED_X += test-regex
 +TEST_PROGRAMS_NEED_X += test-revision-walking
  TEST_PROGRAMS_NEED_X += test-run-command
 +TEST_PROGRAMS_NEED_X += test-scrap-cache-tree
  TEST_PROGRAMS_NEED_X += test-sha1
  TEST_PROGRAMS_NEED_X += test-sigchain
 -TEST_PROGRAMS_NEED_X += test-string-pool
  TEST_PROGRAMS_NEED_X += test-subprocess
  TEST_PROGRAMS_NEED_X += test-svn-fe
 -TEST_PROGRAMS_NEED_X += test-treap
  
  TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))