threads / discuss / 395

Next problem: cg-commit

Subject: Next problem: cg-commit

## tl;dr

2 messages between Apr 29, 2005 and May 2, 2005.

replies: 1people: 2as markdown or json

Russell King· Apr 29, 2005, 20:51 UTC · lore

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

Petr Baudis· May 2, 2005, 22:30 UTC · re: Russell King · lore

Re: Next problem: cg-commit

Dear diary, on Fri, Apr 29, 2005 at 10:51:18PM CEST, I got a letter where Russell King <rmk@arm.linux.org.uk> told me that...

Show 15 quoted lines

> 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.

Nice find, thanks. I added it to few other files too.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor