From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Sep 2012 03:46:39 +0000 (-0700)
Subject: Merge branch 'rj/test-regex' into maint-1.7.11
X-Git-Tag: v1.7.11.7~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dabdc0178ec043ad42f6b3ab80e54f9c9404ab42;p=thirdparty%2Fgit.git

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
---

dabdc0178ec043ad42f6b3ab80e54f9c9404ab42
diff --cc .gitignore
index bf66648e2c,d284b058a3..f1acd3e777
--- a/.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 1f72c1c745,d2b145b533..13293d33fd
--- a/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))