From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jun 2009 07:44:34 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~40
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/916e1373fb86db9d7019de4e7e74e39c9474a153?hp=-c

Merge branch 'maint'

* maint:
t3700-add: add a POSIXPERM prerequisite to a new test
---

916e1373fb86db9d7019de4e7e74e39c9474a153
diff --combined t/t3700-add.sh
index 6ae5a2cd95,fe93ce52e7..85eb0fbf96
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@@ -223,7 -223,7 +223,7 @@@ test_expect_success POSIXPERM 'git add 
  '
  rm -f foo2
  
- test_expect_success '--no-ignore-errors overrides config' '
+ test_expect_success POSIXPERM '--no-ignore-errors overrides config' '
         git config add.ignore-errors 1 &&
         git reset --hard &&
         date >foo1 &&
@@@ -243,16 -243,4 +243,16 @@@ test_expect_success BSLASHPSPEC "git ad
  	! ( git ls-files foobar | grep foobar )
  '
  
 +test_expect_success 'git add to resolve conflicts on otherwise ignored path' '
 +	git reset --hard &&
 +	H=$(git rev-parse :1/2/a) &&
 +	(
 +		echo "100644 $H 1	track-this"
 +		echo "100644 $H 3	track-this"
 +	) | git update-index --index-info &&
 +	echo track-this >>.gitignore &&
 +	echo resolved >track-this &&
 +	git add track-this
 +'
 +
  test_done