undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show the branch name more prominently in "git status".

Browse Source 
When not working on "master" branch, remind the user at the beginning
of the status message, not at the end.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-08-26 16:53:26 -07:00
parent 9a9cbb6e9f
commit 9804b7dc19
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-commit-script
View File

@ -195,8 +195,8 @@ else
fi fi
if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ] if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
then then
sed -ne '/^#/p' .editmsg rm -f .editmsg
rm .editmsg git-status-script
exit 1 exit 1
fi fi
case "$no_edit" in case "$no_edit" in

11
git-status-script
View File

@ -28,6 +28,11 @@ report () {
[ "$header" ] [ "$header" ]
} }
branch=`readlink "$GIT_DIR/HEAD"`
case "$branch" in
refs/heads/master) ;;
*) echo "# On branch $branch" ;;
esac
git-update-cache --refresh >/dev/null 2>&1 git-update-cache --refresh >/dev/null 2>&1
git-diff-cache -M --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="$?" committable="$?"
@ -37,10 +42,4 @@ then
echo "nothing to commit" echo "nothing to commit"
exit 1 exit 1
fi fi
branch=`readlink "$GIT_DIR/HEAD"`
case "$branch" in
refs/heads/master) ;;
*) echo "#
# On branch $branch" ;;
esac
exit 0 exit 0