mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Buglets fix in the new two scripts

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-05-30 13:53:45 -07:00
committed by Linus Torvalds
parent 866b973b5d
commit 2036d84102
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-commit-script
View File

@ -5,9 +5,7 @@ then
cat .editmsg cat .editmsg
exit 1 exit 1
fi fi
ED=${VISUAL:$EDITOR} ${VISUAL:-${EDITOR:-vi}} .editmsg
ED=${ED:vi}
$ED .editmsg
grep -v '^#' < .editmsg | git-stripspace > .cmitmsg grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
[ -s .cmitmsg ] || exit 1 [ -s .cmitmsg ] || exit 1
tree=$(git-write-tree) || exit 1 tree=$(git-write-tree) || exit 1

14
git-status-script
View File

@ -13,13 +13,13 @@ report () {
trailer="# trailer="#
" "
case "$status" in case "$status" in
M) echo "# modified: $name";; M ) echo "# modified: $name";;
D) echo "# deleted: $name";; D*) echo "# deleted: $name";;
T) echo "# typechange: $name";; T ) echo "# typechange: $name";;
C) echo "# copied: $name -> $newname";; C*) echo "# copied: $name -> $newname";;
R) echo "# renamed: $name -> $newname";; R*) echo "# renamed: $name -> $newname";;
N) echo "# new file: $name";; N*) echo "# new file: $name";;
U) echo "# unmerged: $name";; U ) echo "# unmerged: $name";;
esac esac
done done
echo -n "$trailer" echo -n "$trailer"