kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2008-08-13 19:22:29 -07:00
parent 8caa3acf3a 21926fe885
commit a0653d5505
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dir.c
View File

@ -54,7 +54,7 @@ int common_prefix(const char **pathspec)


static inline int special_char(unsigned char c1) static inline int special_char(unsigned char c1)
{ {
return !c1 || c1 == '*' || c1 == '[' || c1 == '?'; return !c1 || c1 == '*' || c1 == '[' || c1 == '?' || c1 == '\\';
} }


/* /*

8
t/t3700-add.sh
View File

@ -222,4 +222,12 @@ test_expect_success 'git add (add.ignore-errors = false)' '
! ( git ls-files foo1 | grep foo1 ) ! ( 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 test_done

8
t/t5304-prune.sh
View File

@ -21,7 +21,7 @@ test_expect_success 'prune stale packs' '
orig_pack=$(echo .git/objects/pack/*.pack) && orig_pack=$(echo .git/objects/pack/*.pack) &&
: > .git/objects/tmp_1.pack && : > .git/objects/tmp_1.pack &&
: > .git/objects/tmp_2.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 && git prune --expire 1.day &&
test -f $orig_pack && test -f $orig_pack &&
test -f .git/objects/tmp_2.pack && test -f .git/objects/tmp_2.pack &&
@ -39,7 +39,7 @@ test_expect_success 'prune --expire' '
git prune --expire=1.hour.ago && git prune --expire=1.hour.ago &&
test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
test -f $BLOB_FILE && test -f $BLOB_FILE &&
test-chmtime -86500 $BLOB_FILE && test-chmtime =-86500 $BLOB_FILE &&
git prune --expire 1.day && git prune --expire 1.day &&
test $before = $(git count-objects | sed "s/ .*//") && test $before = $(git count-objects | sed "s/ .*//") &&
! test -f $BLOB_FILE ! test -f $BLOB_FILE
@ -53,11 +53,11 @@ test_expect_success 'gc: implicit prune --expire' '
BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") && BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") &&
test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
test -f $BLOB_FILE && test -f $BLOB_FILE &&
test-chmtime -$((86400*14-30)) $BLOB_FILE && test-chmtime =-$((86400*14-30)) $BLOB_FILE &&
git gc && git gc &&
test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
test -f $BLOB_FILE && test -f $BLOB_FILE &&
test-chmtime -$((86400*14+1)) $BLOB_FILE && test-chmtime =-$((86400*14+1)) $BLOB_FILE &&
git gc && git gc &&
test $before = $(git count-objects | sed "s/ .*//") && test $before = $(git count-objects | sed "s/ .*//") &&
! test -f $BLOB_FILE ! test -f $BLOB_FILE