[PATCH] Fix the status output when there is nothing to commit.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
It had an extra empty '#' line. Signed-off-by: Junio C Hamano <redacted> --- git-commit-script | 4 ++-- git-status-script | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) 22758793f9cde4379bacb067e2a4551373eaf073
diff --git a/git-commit-script b/git-commit-script
--- 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
diff --git a/git-status-script b/git-status-script
--- a/git-status-script
+++ b/git-status-script@@ -31,8 +31,7 @@ report () { branch=`readlink "$GIT_DIR/HEAD"` case "$branch" in refs/heads/master) ;; -*) echo "# -# On branch $branch" ;; +*) echo "# On branch $branch" ;; esac git-update-cache --refresh >/dev/null 2>&1 git-diff-cache -M --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit"