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

diff --combined t/t3700-add.sh
index 7d123d17fc156c61a8e85a399c3762e8075485de,fcbc203e71cff29de6268e26ff680fef9837bd34..77a782c9ad3ec8cbcdd95cd0dd521b397846c40a
--- 1/t/t3700-add.sh
--- 2/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