author | Junio C Hamano <gitster@pobox.com> | |
Thu, 14 Aug 2008 02:22:29 +0000 (19:22 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 14 Aug 2008 02:22:29 +0000 (19:22 -0700) |
* maint:
t5304-prune: adjust file mtime based on system time rather than file mtime
Fix escaping of glob special characters in pathspecs
t5304-prune: adjust file mtime based on system time rather than file mtime
Fix escaping of glob special characters in pathspecs
dir.c | patch | blob | history | |
t/t3700-add.sh | patch | blob | history | |
t/t5304-prune.sh | patch | blob | history |
index 29d1d5ba31def46ba8b55905dc60773cc6cc167e..109e05b01346ac13296dfbcfa2355a43d97731cd 100644 (file)
--- a/dir.c
+++ b/dir.c
static inline int special_char(unsigned char c1)
{
- return !c1 || c1 == '*' || c1 == '[' || c1 == '?';
+ return !c1 || c1 == '*' || c1 == '[' || c1 == '?' || c1 == '\\';
}
/*
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 7d123d17fc156c61a8e85a399c3762e8075485de..77a782c9ad3ec8cbcdd95cd0dd521b397846c40a 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
! ( 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
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 9fd9d0700033027921c90290cedc0a31d71c7733..771c0a06a4bd01cf40628ffae379b5d992802ef6 100755 (executable)
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
orig_pack=$(echo .git/objects/pack/*.pack) &&
: > .git/objects/tmp_1.pack &&
: > .git/objects/tmp_2.pack &&
- test-chmtime -86501 .git/objects/tmp_1.pack &&
+ test-chmtime =-86501 .git/objects/tmp_1.pack &&
git prune --expire 1.day &&
test -f $orig_pack &&
test -f .git/objects/tmp_2.pack &&
git prune --expire=1.hour.ago &&
test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
test -f $BLOB_FILE &&
- test-chmtime -86500 $BLOB_FILE &&
+ test-chmtime =-86500 $BLOB_FILE &&
git prune --expire 1.day &&
test $before = $(git count-objects | sed "s/ .*//") &&
! test -f $BLOB_FILE
BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") &&
test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
test -f $BLOB_FILE &&
- test-chmtime -$((86400*14-30)) $BLOB_FILE &&
+ test-chmtime =-$((86400*14-30)) $BLOB_FILE &&
git gc &&
test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
test -f $BLOB_FILE &&
- test-chmtime -$((86400*14+1)) $BLOB_FILE &&
+ test-chmtime =-$((86400*14+1)) $BLOB_FILE &&
git gc &&
test $before = $(git count-objects | sed "s/ .*//") &&
! test -f $BLOB_FILE