summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-commit-script4
-rwxr-xr-xgit-status-script14
2 files changed, 8 insertions, 10 deletions
diff --git a/git-commit-script b/git-commit-script
index f8d568c..42ee399 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -5,9 +5,7 @@ then
cat .editmsg
exit 1
fi
-ED=${VISUAL:$EDITOR}
-ED=${ED:vi}
-$ED .editmsg
+${VISUAL:-${EDITOR:-vi}} .editmsg
grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
[ -s .cmitmsg ] || exit 1
tree=$(git-write-tree) || exit 1
diff --git a/git-status-script b/git-status-script
index 72a93f7..f91bb55 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"