From: Junio C Hamano <junkio@cox.net>
Date: Mon, 7 Nov 2005 01:37:40 +0000 (-0800)
Subject: git-status: do not mark unmerged paths as committable.
X-Git-Tag: v0.99.9e^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f1790448628262e46496861bb6da76be63a2a247;p=git.git

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 62a24a9b0..837f334d8 100755
--- 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