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

From: Junio C Hamano <junkio@cox.net>
Date: Nov 7, 2005, 01:39 UTC
Message-ID: <7vslu9uthh.fsf@assigned-by-dhcp.cox.net>

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>

---

 git-status.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 49ac95e5ebfd28b32ec1a23a0982900426f0c06c f1790448628262e46496861bb6da76be63a2a247

diff --git a/git-status.sh b/git-status.sh
index 62a24a9..837f334 100755
--- a/git-status.sh
+++ b/git-status.sh
@@ -41,7 +41,7 @@ git-update-index -q --unmerged --refresh
 
 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
---
0.99.9.GIT