Merge branch 'maint'

gitster · gitster · commit 916e1373fb86 · 2009-06-22T00:44:34.000-07:00
* maint:
  t3700-add: add a POSIXPERM prerequisite to a new test
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
@@ -223,7 +223,7 @@ test_expect_success POSIXPERM 'git add (add.ignore-errors = false)' '
 '
 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 &&

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ test_expect_success POSIXPERM 'git add (add.ignore-errors = false)' '`
`223`	`223`	`'`
`224`	`224`	`rm -f foo2`
`225`	`225`
`226`		`-test_expect_success '--no-ignore-errors overrides config' '`
	`226`	`+test_expect_success POSIXPERM '--no-ignore-errors overrides config' '`
`227`	`227`	`git config add.ignore-errors 1 &&`
`228`	`228`	`git reset --hard &&`
`229`	`229`	`date >foo1 &&`