{"thread":{"id":"395","subject":"Next problem: cg-commit","startedAt":"2005-04-29T20:51:18Z","lastAt":"2005-05-02T22:30:31Z","messageCount":2,"participants":["Russell King","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"2186","messageId":"20050429215118.D30010@flint.arm.linux.org.uk","threadId":"395","inReplyTo":null,"subject":"Next problem: cg-commit","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-04-29T20:51:18Z","receivedAt":"2005-04-29T20:51:18Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"Unfortunately, cg-commit seems to return wrong exit status, returning\n1 on success.  Eg:\n\n$ cg-commit\narch/arm/mach-ixp2000/pci.c\ninclude/asm-arm/arch-ixp2000/platform.h\nEnter commit message, terminated by ctrl-D on a separate line:\nblah blah blah\nCommitted as fafb525292acc9c0818b91b1d8e58cf770616542.\n$ echo $?\n1\n\nIt appears that [ \"$merging\" ] towards the end of cg-commit is the\ncause of this odd behaviour.  Force zero exit status, since we\nsuccessfully completed.\n\nSigned-off-by: Russell King <rmk@arm.linux.org.uk>\n\n--- cg-commit.old\t2005-04-26 04:02:01.000000000 +0100\n+++ cg-commit\t2005-04-29 21:47:57.161333483 +0100\n@@ -114,6 +114,7 @@\n \techo \"Committed as $newhead.\"\n \techo $newhead >.git/HEAD\n \t[ \"$merging\" ] && rm .git/merging .git/merging-sym .git/merge-base\n+\texit 0\n else\n \tdie \"error during commit (oldhead $oldhead, treeid $treeid)\"\n fi\n\n\n-- \nRussell King\n\n"},{"id":"2410","messageId":"20050502223031.GG20818@pasky.ji.cz","threadId":"395","inReplyTo":"20050429215118.D30010@flint.arm.linux.org.uk","subject":"Re: Next problem: cg-commit","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-02T22:30:31Z","receivedAt":"2005-05-02T22:30:31Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Fri, Apr 29, 2005 at 10:51:18PM CEST, I got a letter\nwhere Russell King <rmk@arm.linux.org.uk> told me that...\n> Unfortunately, cg-commit seems to return wrong exit status, returning\n> 1 on success.  Eg:\n> \n> $ cg-commit\n> arch/arm/mach-ixp2000/pci.c\n> include/asm-arm/arch-ixp2000/platform.h\n> Enter commit message, terminated by ctrl-D on a separate line:\n> blah blah blah\n> Committed as fafb525292acc9c0818b91b1d8e58cf770616542.\n> $ echo $?\n> 1\n> \n> It appears that [ \"$merging\" ] towards the end of cg-commit is the\n> cause of this odd behaviour.  Force zero exit status, since we\n> successfully completed.\n\nNice find, thanks. I added it to few other files too.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"}]}