submodule: print graph output next to submodule log

diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 5adba4f5e4f2476a60bfe41c0246f7a5a72127b6..06749a6aa07e40a5e5081c8912264d9c15b385ef 100755 (executable)
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -5,7 +5,7 @@
 #                   Grenoble INP Ensimag
 #
 
-test_description='git status advices'
+test_description='git status advice'
 
 . ./test-lib.sh
 
@@ -14,6 +14,7 @@ test_description='git status advices'
 set_fake_editor
 
 test_expect_success 'prepare for conflicts' '
+       git config --global advice.statusuoption false &&
        test_commit init main.txt init &&
        git branch conflicts &&
        test_commit on_master main.txt on_master &&
@@ -578,7 +579,7 @@ test_expect_success 'status when bisecting' '
        TGT=$(git rev-parse --short two_bisect) &&
        cat >expected <<-EOF &&
        # HEAD detached at $TGT
-       # You are currently bisecting branch '\''bisect'\''.
+       # You are currently bisecting, started from branch '\''bisect'\''.
        #   (use "git bisect reset" to get back to the original branch)
        #
        nothing to commit (use -u to show untracked files)