Commits

Anonymous committed f179044

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>

Comments (0)

Files changed (1)

 
 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