blame: allow "blame file" in the middle of a conflicted merge

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 24728facf9c9fbf92a7aca4a5eb20e5905a84bee..5d0e79fe2a09c469c61b54957f5098c0928bca9c 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -656,9 +656,14 @@ test_expect_success 'status --porcelain ignores color.status' '
 git config --unset color.status
 git config --unset color.ui
 
-test_expect_success 'status --porcelain ignores -b' '
+test_expect_success 'status --porcelain respects -b' '
 
        git status --porcelain -b >output &&
+       {
+               echo "## master" &&
+               cat expect
+       } >tmp &&
+       mv tmp expect &&
        test_cmp expect output
 
 '