wt-status.c: set commitable bit if there is a meaningful merge.

diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh
index 460789b4d85241eb51c0c1a5a1f4be7d4a0d7154..cdc0747bf01b0598a2e864073887896162815019 100755 (executable)
--- a/t/t7061-wtstatus-ignore.sh
+++ b/t/t7061-wtstatus-ignore.sh
@@ -20,6 +20,15 @@ test_expect_success 'status untracked directory with --ignored' '
        test_cmp expected actual
 '
 
+test_expect_success 'same with gitignore starting with BOM' '
+       printf "\357\273\277ignored\n" >.gitignore &&
+       mkdir -p untracked &&
+       : >untracked/ignored &&
+       : >untracked/uncommitted &&
+       git status --porcelain --ignored >actual &&
+       test_cmp expected actual
+'
+
 cat >expected <<\EOF
 ?? .gitignore
 ?? actual