From: Junio C Hamano <junkio@cox.net>
Date: Mon, 30 May 2005 20:53:45 +0000 (-0700)
Subject: [PATCH] Buglets fix in the new two scripts
X-Git-Tag: v0.99~408
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2036d841020b7500eca7d568bd0c353b4fe73408;p=git.git

[PATCH] Buglets fix in the new two scripts

Should be obvious...

 - Use $VISUAL, $EDITOR, in this order if set, and fall back on
   vi.

 - Status R, C, D, N usually are followed by number, so adjust
   case arms to that pattern.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/git-commit-script b/git-commit-script
index f8d568ce8..42ee399bc 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 72a93f74e..f91bb5589 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"