Fourth batch

diff --git a/t/t3306-notes-prune.sh b/t/t3306-notes-prune.sh
index a0ed0353e69dd6dbc96f1a8e3c9251757b4f408f..8f4102ff9e446bce66436b5e7046c84d739c226f 100755 (executable)
--- a/t/t3306-notes-prune.sh
+++ b/t/t3306-notes-prune.sh
@@ -11,20 +11,26 @@ test_expect_success 'setup: create a few commits with notes' '
        test_tick &&
        git commit -m 1st &&
        git notes add -m "Note #1" &&
+       first=$(git rev-parse HEAD) &&
        : > file2 &&
        git add file2 &&
        test_tick &&
        git commit -m 2nd &&
        git notes add -m "Note #2" &&
+       second=$(git rev-parse HEAD) &&
        : > file3 &&
        git add file3 &&
        test_tick &&
        git commit -m 3rd &&
+       third=$(git rev-parse HEAD) &&
+       COMMIT_FILE=$(echo $third | sed "s!^..!.git/objects/&/!") &&
+       test -f $COMMIT_FILE &&
+       test-tool chmtime =+0 $COMMIT_FILE &&
        git notes add -m "Note #3"
 '
 
 cat > expect <<END_OF_LOG
-commit 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
+commit $third
 Author: A U Thor <author@example.com>
 Date:   Thu Apr 7 15:15:13 2005 -0700
 
@@ -33,7 +39,7 @@ Date:   Thu Apr 7 15:15:13 2005 -0700
 Notes:
     Note #3
 
-commit 08341ad9e94faa089d60fd3f523affb25c6da189
+commit $second
 Author: A U Thor <author@example.com>
 Date:   Thu Apr 7 15:14:13 2005 -0700
 
@@ -42,7 +48,7 @@ Date:   Thu Apr 7 15:14:13 2005 -0700
 Notes:
     Note #2
 
-commit ab5f302035f2e7aaf04265f08b42034c23256e1f
+commit $first
 Author: A U Thor <author@example.com>
 Date:   Thu Apr 7 15:13:13 2005 -0700
 
@@ -60,25 +66,42 @@ test_expect_success 'verify commits and notes' '
 
 test_expect_success 'remove some commits' '
 
-       git reset --hard HEAD~2 &&
+       git reset --hard HEAD~1 &&
        git reflog expire --expire=now HEAD &&
        git gc --prune=now
 '
 
 test_expect_success 'verify that commits are gone' '
 
-       ! git cat-file -p 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
-       ! git cat-file -p 08341ad9e94faa089d60fd3f523affb25c6da189 &&
-       git cat-file -p ab5f302035f2e7aaf04265f08b42034c23256e1f
+       test_must_fail git cat-file -p $third &&
+       git cat-file -p $second &&
+       git cat-file -p $first
 '
 
 test_expect_success 'verify that notes are still present' '
 
-       git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
-       git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
-       git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+       git notes show $third &&
+       git notes show $second &&
+       git notes show $first
 '
 
+test_expect_success 'prune -n does not remove notes' '
+
+       git notes list > expect &&
+       git notes prune -n &&
+       git notes list > actual &&
+       test_cmp expect actual
+'
+
+
+test_expect_success 'prune -n lists prunable notes' '
+
+       echo $third >expect &&
+       git notes prune -n > actual &&
+       test_cmp expect actual
+'
+
+
 test_expect_success 'prune notes' '
 
        git notes prune
@@ -86,9 +109,30 @@ test_expect_success 'prune notes' '
 
 test_expect_success 'verify that notes are gone' '
 
-       ! git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
-       ! git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
-       git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+       test_must_fail git notes show $third &&
+       git notes show $second &&
+       git notes show $first
+'
+
+test_expect_success 'remove some commits' '
+
+       git reset --hard HEAD~1 &&
+       git reflog expire --expire=now HEAD &&
+       git gc --prune=now
+'
+
+test_expect_success 'prune -v notes' '
+
+       echo $second >expect &&
+       git notes prune -v > actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'verify that notes are gone' '
+
+       test_must_fail git notes show $third &&
+       test_must_fail git notes show $second &&
+       git notes show $first
 '
 
 test_done