git-status: do not mark unmerged paths as committable.

An unmerged path appears as both "Updated but not checked in" list,
and "Changed but not updated" list.  We are not going to commit that
path until it is resolved, so remove it from the former list.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-status.sh b/git-status.sh
index 62a24a9b03a259fa94f61b3cb060c2b99f55e40e..837f334d8760c9ff4af4de5d057e97d7af3cfc61 100755 (executable)
--- a/git-status.sh
+++ b/git-status.sh
@@ -41,7 +41,7 @@ git-update-index -q --unmerged --refresh || exit
 
 if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1
 then
-       git-diff-index -M --cached --name-status HEAD |
+       git-diff-index -M --cached --name-status --diff-filter=MDTCRA HEAD |
        sed -e '
                s/\\/\\\\/g
                s/ /\\ /g