Merge branch 'rj/test-regex' into maint-1.7.11

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

diff --cc .gitignore
index bf66648e2c5f59cb92470dbda546c5348bcc85ef,d284b058a33dfa8235d8608a89a500bfef1c1028..f1acd3e777f5b8be846b3bdabf4743b84ad4fbca
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -182,11 -180,11 +182,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 1f72c1c74548ff1622232132d1ff717855f007bc,d2b145b533485d9064c5e2db76949dd5b3a41863..13293d33fd1debc5a7dce38b7bf93ea9a89d11ca
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -491,17 -472,18 +491,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))