From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Aug 2008 02:22:29 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a0653d550524a0263d36fde6a8cf98941dd057ab?ds=inline;hp=-c

Merge branch 'maint'

* maint:
t5304-prune: adjust file mtime based on system time rather than file mtime
Fix escaping of glob special characters in pathspecs
---

a0653d550524a0263d36fde6a8cf98941dd057ab
diff --combined t/t3700-add.sh
index 7d123d17fc,fcbc203e71..77a782c9ad
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@@ -85,12 -85,12 +85,12 @@@ test_expect_success '.gitignore is hono
  '
  
  test_expect_success 'error out when attempting to add ignored ones without -f' '
 -	! git add a.?? &&
 +	test_must_fail git add a.?? &&
  	! (git ls-files | grep "\\.ig")
  '
  
  test_expect_success 'error out when attempting to add ignored ones without -f' '
 -	! git add d.?? &&
 +	test_must_fail git add d.?? &&
  	! (git ls-files | grep "\\.ig")
  '
  
@@@ -222,4 -222,12 +222,12 @@@ test_expect_success 'git add (add.ignor
  	! ( git ls-files foo1 | grep foo1 )
  '
  
+ test_expect_success 'git add '\''fo\?bar'\'' ignores foobar' '
+ 	git reset --hard &&
+ 	touch fo\?bar foobar &&
+ 	git add '\''fo\?bar'\'' &&
+ 	git ls-files fo\?bar | grep -F fo\?bar &&
+ 	! ( git ls-files foobar | grep foobar )
+ '
+ 
  test_done