summaryrefslogtreecommitdiff
path: root/git-commit-script
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-08-26 16:53:26 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-28 12:15:09 -0700
commit9804b7dc1974d59d4d37c37ba4624bb835456207 (patch)
tree00ea6ac52cf531e1c226c7280e412e4c1bb010d0 /git-commit-script
parentBarf nicely when "git push" is run without parameter. (diff)
downloadtgif-9804b7dc1974d59d4d37c37ba4624bb835456207.tar.xz
Show the branch name more prominently in "git status".
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>
Diffstat (limited to 'git-commit-script')
-rwxr-xr-xgit-commit-script4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-commit-script b/git-commit-script
index e47a090c97..4987e37861 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -195,8 +195,8 @@ else
fi
if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
then
- sed -ne '/^#/p' .editmsg
- rm .editmsg
+ rm -f .editmsg
+ git-status-script
exit 1
fi
case "$no_edit" in