diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 0c435f957489b011623d320411dbc619163f80a9..f959aae84630ddbb68304868b1a025b7c2d33d10 100755 (executable)
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
}
check_fsck () {
}
check_fsck () {
- output=$(git fsck-objects --full)
+ output=$(git fsck --full)
case "$1" in
'')
test -z "$output" ;;
case "$1" in
'')
test -z "$output" ;;
check_fsck &&
chmod +x C &&
check_fsck &&
chmod +x C &&
- ( test "`git repo-config --bool core.filemode`" != false ||
+ ( test "`git config --bool core.filemode`" != false ||
echo executable >>C ) &&
git add C &&
test_tick && git commit -m dragon &&
echo executable >>C ) &&
git add C &&
test_tick && git commit -m dragon &&
check_have A B C D E F G H I J K L &&
check_have A B C D E F G H I J K L &&
- git prune --grace=off &&
+ git prune &&
check_have A B C D E F G H I J K L &&
check_have A B C D E F G H I J K L &&
check_have A B C D E F G H I J K L &&
check_have A B C D E F G H I J K L &&
- git prune --grace=off &&
+ git prune &&
check_have A B C D E F G H I J K L &&
check_have A B C D E F G H I J K L &&
test_expect_success 'prune and fsck' '
test_expect_success 'prune and fsck' '
- git prune --grace=off &&
+ git prune &&
check_fsck &&
check_have A B C D E H L &&
check_fsck &&
check_have A B C D E H L &&
'
'
+test_expect_success 'prune --expire' '
+
+ before=$(git count-objects | sed "s/ .*//") &&
+ BLOB=$(echo aleph | git hash-object -w --stdin) &&
+ BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") &&
+ test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
+ test -f $BLOB_FILE &&
+ git reset --hard &&
+ git prune --expire=1.hour.ago &&
+ test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
+ test -f $BLOB_FILE &&
+ test-chmtime -86500 $BLOB_FILE &&
+ git prune --expire 1.day &&
+ test $before = $(git count-objects | sed "s/ .*//") &&
+ ! test -f $BLOB_FILE
+
+'
+
test_done
test_done