dir: free untracked cache when removing it

diff --git a/t/t7509-commit.sh b/t/t7509-commit.sh
index 77b69200297e222319b5701c62312bee27b62ce9..db9774e345586428ae1ac23f11d92ae00e05c1e9 100755 (executable)
--- a/t/t7509-commit.sh
+++ b/t/t7509-commit.sh
@@ -77,6 +77,7 @@ test_expect_success '--amend option copies authorship' '
        git commit -a --amend -m "amend test" &&
        author_header Initial >expect &&
        author_header HEAD >actual &&
+       test_cmp expect actual &&
 
        echo "amend test" >expect &&
        message_body HEAD >actual &&
@@ -89,22 +90,10 @@ sha1_file() {
 remove_object() {
        rm -f $(sha1_file "$*")
 }
-no_reflog() {
-       cp .git/config .git/config.saved &&
-       echo "[core] logallrefupdates = false" >>.git/config &&
-       test_when_finished "mv -f .git/config.saved .git/config" &&
-
-       if test -e .git/logs
-       then
-               mv .git/logs . &&
-               test_when_finished "mv logs .git/"
-       fi
-}
 
 test_expect_success '--amend option with empty author' '
        git cat-file commit Initial >tmp &&
        sed "s/author [^<]* </author  </" tmp >empty-author &&
-       no_reflog &&
        sha=$(git hash-object -t commit -w empty-author) &&
        test_when_finished "remove_object $sha" &&
        git checkout $sha &&
@@ -118,7 +107,6 @@ test_expect_success '--amend option with empty author' '
 test_expect_success '--amend option with missing author' '
        git cat-file commit Initial >tmp &&
        sed "s/author [^<]* </author </" tmp >malformed &&
-       no_reflog &&
        sha=$(git hash-object -t commit -w malformed) &&
        test_when_finished "remove_object $sha" &&
        git checkout $sha &&
@@ -157,4 +145,33 @@ test_expect_success '--reset-author should be rejected without -c/-C/--amend' '
        test_must_fail git commit -a --reset-author -m done
 '
 
+test_expect_success 'commit respects CHERRY_PICK_HEAD and MERGE_MSG' '
+       echo "cherry-pick 1a" >>foo &&
+       test_tick &&
+       git commit -am "cherry-pick 1" --author="Cherry <cherry@pick.er>" &&
+       git tag cherry-pick-head &&
+       git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD &&
+       echo "This is a MERGE_MSG" >.git/MERGE_MSG &&
+       echo "cherry-pick 1b" >>foo &&
+       test_tick &&
+       git commit -a &&
+       author_header cherry-pick-head >expect &&
+       author_header HEAD >actual &&
+       test_cmp expect actual &&
+
+       echo "This is a MERGE_MSG" >expect &&
+       message_body HEAD >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '--reset-author with CHERRY_PICK_HEAD' '
+       git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD &&
+       echo "cherry-pick 2" >>foo &&
+       test_tick &&
+       git commit -am "cherry-pick 2" --reset-author &&
+       echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+       author_header HEAD >actual &&
+       test_cmp expect actual
+'
+
 test_done