builtin/fetch.c: respect 'submodule.recurse' option

diff --git a/t/t7509-commit.sh b/t/t7509-commit.sh
index b61fd3c3c4c949785a595dac0fdcc48f4f7faf93..ddef7ea6b0d87ef5922bf267ee3fdc9ade4383af 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 &&
@@ -112,13 +101,12 @@ test_expect_success '--amend option with empty author' '
        echo "Empty author test" >>foo &&
        test_tick &&
        test_must_fail git commit -a -m "empty author" --amend 2>err &&
-       grep "empty ident" err
+       test_i18ngrep "empty ident" err
 '
 
 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 &&
@@ -126,7 +114,7 @@ test_expect_success '--amend option with missing author' '
        echo "Missing author test" >>foo &&
        test_tick &&
        test_must_fail git commit -a -m "malformed author" --amend 2>err &&
-       grep "empty ident" err
+       test_i18ngrep "empty ident" err
 '
 
 test_expect_success '--reset-author makes the commit ours even with --amend option' '