diff options
author | Junio C Hamano <junkio@cox.net> | 2007-01-21 21:29:44 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-01-21 21:29:57 -0800 |
commit | 026aa93818a536c819a94aae5bbefe1b6251fe0e (patch) | |
tree | 4c03787020e72a0957972900f10a5905b1661bec /t | |
parent | 1bb914603a0f151669de2c31671f6c878c5eb79f (diff) | |
download | git-026aa93818a536c819a94aae5bbefe1b6251fe0e.tar.gz git-026aa93818a536c819a94aae5bbefe1b6251fe0e.tar.xz |
Revert "prune: --grace=time"
This reverts commit 9b088c4e394df84232cfd37aea78349a495b09c1.
Protecting 'mature' objects does not make it any safer. We should
admit that git-prune is inherently unsafe when run in parallel with
other operations without involving unwarranted locking overhead,
and with the latest git, even rebase and reset would not immediately
create crufts anyway.
Diffstat (limited to 't')
-rwxr-xr-x | t/t1410-reflog.sh | 6 | ||||
-rwxr-xr-x | t/t5400-send-pack.sh | 4 | ||||
-rwxr-xr-x | t/t5700-clone-reference.sh | 4 | ||||
-rwxr-xr-x | t/t5710-info-alternate.sh | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index 0c435f957..8e8d526ef 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -96,7 +96,7 @@ test_expect_success setup ' 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 && @@ -115,7 +115,7 @@ test_expect_success rewind ' 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 && @@ -160,7 +160,7 @@ test_expect_success 'reflog expire' ' test_expect_success 'prune and fsck' ' - git prune --grace=off && + git prune && check_fsck && check_have A B C D E H L && diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index 2a55d5ae3..2c151912a 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -55,13 +55,13 @@ test_expect_success setup ' test_expect_success 'pack the source repository' ' git repack -a -d && - git prune --grace=off + git prune ' test_expect_success 'pack the destination repository' ' cd victim && git repack -a -d && - git prune --grace=off && + git prune && cd .. ' diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh index ab00e8fb6..dd9caad1c 100755 --- a/t/t5700-clone-reference.sh +++ b/t/t5700-clone-reference.sh @@ -22,7 +22,7 @@ echo second > file2 && git add file2 && git commit -m addition && git repack -a -d && -git prune --grace=off' +git prune' cd "$base_dir" @@ -56,7 +56,7 @@ echo third > file3 && git add file3 && git commit -m update && git repack -a -d && -git prune --grace=off' +git prune' cd "$base_dir" diff --git a/t/t5710-info-alternate.sh b/t/t5710-info-alternate.sh index c30fee81f..b9f6d9636 100755 --- a/t/t5710-info-alternate.sh +++ b/t/t5710-info-alternate.sh @@ -29,7 +29,7 @@ echo "Hello World" > file1 && git add file1 && git commit -m "Initial commit" file1 && git repack -a -d && -git prune --grace=off' +git prune' cd "$base_dir" @@ -39,7 +39,7 @@ echo "foo bar" > file2 && git add file2 && git commit -m "next commit" file2 && git repack -a -d -l && -git prune --grace=off' +git prune' cd "$base_dir" @@ -49,7 +49,7 @@ echo "Goodbye, cruel world" > file3 && git add file3 && git commit -m "one more" file3 && git repack -a -d -l && -git prune --grace=off' +git prune' cd "$base_dir" |