dir: free untracked cache when removing it

diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index aa31abe32b3abc1b43d8111f6503313aa8237455..18372caa151a30ac0ec1f247e793164fe667358a 100755 (executable)
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -15,19 +15,19 @@ test_expect_success 'git pull -q' '
        mkdir clonedq &&
        (cd clonedq && git init &&
        git pull -q "../parent" >out 2>err &&
-       test ! -s err &&
-       test ! -s out)
+       test_must_be_empty err &&
+       test_must_be_empty out)
 '
 
 test_expect_success 'git pull -q --rebase' '
        mkdir clonedqrb &&
        (cd clonedqrb && git init &&
        git pull -q --rebase "../parent" >out 2>err &&
-       test ! -s err &&
-       test ! -s out &&
+       test_must_be_empty err &&
+       test_must_be_empty out &&
        git pull -q --rebase "../parent" >out 2>err &&
-       test ! -s err &&
-       test ! -s out)
+       test_must_be_empty err &&
+       test_must_be_empty out)
 '
 
 test_expect_success 'git pull' '
@@ -35,7 +35,7 @@ test_expect_success 'git pull' '
        (cd cloned && git init &&
        git pull "../parent" >out 2>err &&
        test -s err &&
-       test ! -s out)
+       test_must_be_empty out)
 '
 
 test_expect_success 'git pull --rebase' '
@@ -43,7 +43,7 @@ test_expect_success 'git pull --rebase' '
        (cd clonedrb && git init &&
        git pull --rebase "../parent" >out 2>err &&
        test -s err &&
-       test ! -s out)
+       test_must_be_empty out)
 '
 
 test_expect_success 'git pull -v' '
@@ -51,7 +51,7 @@ test_expect_success 'git pull -v' '
        (cd clonedv && git init &&
        git pull -v "../parent" >out 2>err &&
        test -s err &&
-       test ! -s out)
+       test_must_be_empty out)
 '
 
 test_expect_success 'git pull -v --rebase' '
@@ -59,22 +59,22 @@ test_expect_success 'git pull -v --rebase' '
        (cd clonedvrb && git init &&
        git pull -v --rebase "../parent" >out 2>err &&
        test -s err &&
-       test ! -s out)
+       test_must_be_empty out)
 '
 
 test_expect_success 'git pull -v -q' '
        mkdir clonedvq &&
        (cd clonedvq && git init &&
        git pull -v -q "../parent" >out 2>err &&
-       test ! -s out &&
-       test ! -s err)
+       test_must_be_empty out &&
+       test_must_be_empty err)
 '
 
 test_expect_success 'git pull -q -v' '
        mkdir clonedqv &&
        (cd clonedqv && git init &&
        git pull -q -v "../parent" >out 2>err &&
-       test ! -s out &&
+       test_must_be_empty out &&
        test -s err)
 '
 
@@ -117,4 +117,31 @@ test_expect_success 'git pull --all' '
        )
 '
 
+test_expect_success 'git pull --dry-run' '
+       test_when_finished "rm -rf clonedry" &&
+       git init clonedry &&
+       (
+               cd clonedry &&
+               git pull --dry-run ../parent &&
+               test_path_is_missing .git/FETCH_HEAD &&
+               test_path_is_missing .git/refs/heads/master &&
+               test_path_is_missing .git/index &&
+               test_path_is_missing file
+       )
+'
+
+test_expect_success 'git pull --all --dry-run' '
+       test_when_finished "rm -rf cloneddry" &&
+       git init clonedry &&
+       (
+               cd clonedry &&
+               git remote add origin ../parent &&
+               git pull --all --dry-run &&
+               test_path_is_missing .git/FETCH_HEAD &&
+               test_path_is_missing .git/refs/remotes/origin/master &&
+               test_path_is_missing .git/index &&
+               test_path_is_missing file
+       )
+'
+
 test_done