Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Subject: [PATCH] Fix the status output when there is nothing to commit.
Date: Fri, 26 Aug 2005 01:04:06 -0700	[thread overview]
Message-ID: <7vek8hgm4p.fsf@assigned-by-dhcp.cox.net> (raw)

It had an extra empty '#' line.

Signed-off-by: Junio C Hamano <junkio@cox.net>

---

 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"

                 reply	other threads:[~2005-08-26  8:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vek8hgm4p.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox