X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-status-script;h=7d47fdea79aafaab1d6357d8ce478e2fb40b45b0;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=72a93f74e8152417578f4c250852450a61bd8440;hpb=a3e870f2e2bcacc80d5b81d7b77c15a7928a9082;p=git.git diff --git a/git-status-script b/git-status-script index 72a93f74..7d47fdea 100755 --- a/git-status-script +++ b/git-status-script @@ -13,13 +13,13 @@ report () { trailer="# " case "$status" in - M) echo "# modified: $name";; - D) echo "# deleted: $name";; - T) echo "# typechange: $name";; - C) echo "# copied: $name -> $newname";; - R) echo "# renamed: $name -> $newname";; - N) echo "# new file: $name";; - U) echo "# unmerged: $name";; + M ) echo "# modified: $name";; + D*) echo "# deleted: $name";; + T ) echo "# typechange: $name";; + C*) echo "# copied: $name -> $newname";; + R*) echo "# renamed: $name -> $newname";; + N*) echo "# new file: $name";; + U ) echo "# unmerged: $name";; esac done echo -n "$trailer" @@ -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" ]