Merge branch 'jk/blame-first-parent' into maint

diff --git a/t/t7509-commit.sh b/t/t7509-commit.sh
index 9ac794052df6ac925733ff8a8852e9759bb0baf0..db9774e345586428ae1ac23f11d92ae00e05c1e9 100755 (executable)
--- a/t/t7509-commit.sh
+++ b/t/t7509-commit.sh
@@ -90,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 &&
@@ -119,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 &&