X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-status-script;h=e9a03834415e926e8f42df9c0f699204af51fec9;hb=b55db7ba283c1f7d2ff3cbc7e351d3ae504c9b1d;hp=f91bb55894a07f3ebca9031f2fa2ba2ef8789ffd;hpb=2036d841020b7500eca7d568bd0c353b4fe73408;p=git.git diff --git a/git-status-script b/git-status-script index f91bb5589..e9a038344 100755 --- a/git-status-script +++ b/git-status-script @@ -18,7 +18,7 @@ report () { T ) echo "# typechange: $name";; C*) echo "# copied: $name -> $newname";; R*) echo "# renamed: $name -> $newname";; - N*) echo "# new file: $name";; + A*) echo "# new file: $name";; U ) echo "# unmerged: $name";; esac done @@ -27,7 +27,7 @@ report () { } git-update-cache --refresh >& /dev/null -git-diff-cache -B -C --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit" +git-diff-cache -M --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit" committable="$?" git-diff-files | sed 's/^://' | report "Changed but not updated" "use git-update-cache to mark for commit" if [ "$committable" == "0" ]