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>
Junio C Hamano committed
Nov 6, 2005 at 17:37 UTC
f1790448628262e46496861bb6da76be63a2a247
1 file changed
+1
-1
git-status.sh
+1
-1
@@ -41,7 +41,7 @@ git-update-index -q --unmerged --refresh || exit
41
42
if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1
43
then
44
- git-diff-index -M --cached --name-status HEAD |
44
+ git-diff-index -M --cached --name-status --diff-filter=MDTCRA HEAD |
45
sed -e '
46
s/\\/\\\\/g
47
s/ /\\ /g