From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Jan 2011 19:35:28 +0000 (-0800)
Subject: Merge branch 'rj/test-fixes'
X-Git-Tag: v1.7.4-rc2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7810c6b6d6cf91d624216623e2327d7cb63c1c92;p=git.git

Merge branch 'rj/test-fixes'

* rj/test-fixes:
  t4135-*.sh: Skip the "backslash" tests on cygwin
  t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
  t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
  t6038-*.sh: Pass the -b (--binary) option to sed on cygwin

Conflicts:
	t/t3032-merge-recursive-options.sh
---

7810c6b6d6cf91d624216623e2327d7cb63c1c92
diff --cc t/t3032-merge-recursive-options.sh
index de9ff89d1,29e049af5..44f5421be
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@@ -13,12 -13,15 +13,15 @@@ test_description='merge-recursive optio
  
  . ./test-lib.sh
  
+ test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
+ test_have_prereq MINGW && export GREP_OPTIONS=-U
+ 
  test_expect_success 'setup' '
  	conflict_hunks () {
- 		sed -n -e "
+ 		sed $SED_OPTIONS -n -e "
 -			/^<<<</ b inconflict
 +			/^<<<</ b conflict
  			b
 -			: inconflict
 +			: conflict
  			p
  			/^>>>>/ b
  			n