Merge branch 'cb/maint-1.6.3-grep-relative-up' into maint

* cb/maint-1.6.3-grep-relative-up:
  grep: accept relative paths outside current working directory
  grep: fix exit status if external_grep() punts

Conflicts:
	t/t7002-grep.sh

1 files changed, 17 insertions, 0 deletions

diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index b13aa7e89a..6ca11d7146 100755
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -279,4 +279,21 @@ test_expect_success 'grep -p -B5' '
 	test_cmp expected actual
 '
 
+test_expect_success 'grep from a subdirectory to search wider area (1)' '
+	mkdir -p s &&
+	(
+		cd s && git grep "x x x" ..
+	)
+'
+
+test_expect_success 'grep from a subdirectory to search wider area (2)' '
+	mkdir -p s &&
+	(
+		cd s || exit 1
+		( git grep xxyyzz .. >out ; echo $? >status )
+		! test -s out &&
+		test 1 = $(cat status)
+	)
+'
+
 test_done