git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Russell King <rmk@arm.linux.org.uk>
To: git@vger.kernel.org
Subject: Next problem: cg-commit
Date: Fri, 29 Apr 2005 21:51:18 +0100	[thread overview]
Message-ID: <20050429215118.D30010@flint.arm.linux.org.uk> (raw)

Unfortunately, cg-commit seems to return wrong exit status, returning
1 on success.  Eg:

$ cg-commit
arch/arm/mach-ixp2000/pci.c
include/asm-arm/arch-ixp2000/platform.h
Enter commit message, terminated by ctrl-D on a separate line:
blah blah blah
Committed as fafb525292acc9c0818b91b1d8e58cf770616542.
$ echo $?
1

It appears that [ "$merging" ] towards the end of cg-commit is the
cause of this odd behaviour.  Force zero exit status, since we
successfully completed.

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

--- cg-commit.old	2005-04-26 04:02:01.000000000 +0100
+++ cg-commit	2005-04-29 21:47:57.161333483 +0100
@@ -114,6 +114,7 @@
 	echo "Committed as $newhead."
 	echo $newhead >.git/HEAD
 	[ "$merging" ] && rm .git/merging .git/merging-sym .git/merge-base
+	exit 0
 else
 	die "error during commit (oldhead $oldhead, treeid $treeid)"
 fi


-- 
Russell King


             reply	other threads:[~2005-04-29 20:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-04-29 20:51 Russell King [this message]
2005-05-02 22:30 ` Next problem: cg-commit Petr Baudis

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=20050429215118.D30010@flint.arm.linux.org.uk \
    --to=rmk@arm.linux.org.uk \
    --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;
as well as URLs for NNTP newsgroup(s).