Next problem: cg-commit

From: Russell King <rmk@arm.linux.org.uk>
Date: Apr 29, 2005, 20:51 UTC
Message-ID: <20050429215118.D30010@flint.arm.linux.org.uk>

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