Ramkumar Ramachandra wrote: > a > positive exit status can be interpreted as a conflict, but this is > clearly not the case here. How do we fix this problem? By creating > an API for "git commit", not by shelling out like this and letting it > take over the exit status. That might be a nice thing to do anyway, but I don't see how it would solve anything. The new "git commit" API would presumably return an integer or enum value to indicate the result of trying to commit. Tests in the testsuite for the "git commit" API would use the "git commit" command, which would expose the newly fine-grained values somehow. And other people scripting but wanting the porcelain to take care of basic UI would benefit, too. Right? Actually, I think cherry-pick returning a positive exit status for "nothing left to commit after resolving conflicts" would be sensible. It is "I did what you asked but need your help to determine the final content of the commit or decide to skip it", rather than "you asked for something unsensible and I am bailing out". -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html