summaryrefslogtreecommitdiff
path: root/git-commit-script
diff options
context:
space:
mode:
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