{"thread":{"id":"4695","subject":"[PATCH (fixed) 1/2] rebase: check for errors from git-commit","startedAt":"2006-06-28T10:24:23Z","lastAt":"2006-06-28T10:24:23Z","messageCount":1,"participants":["Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"22734","messageId":"20060628102423.GA25093@soma","threadId":"4695","inReplyTo":null,"subject":"[PATCH (fixed) 1/2] rebase: check for errors from git-commit","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-06-28T10:24:23Z","receivedAt":"2006-06-28T10:24:23Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"commit does not always succeed, so we'll have to check for\nit in the absence of set -e.  This fixes a regression\nintroduced in 9e4bc7dd1bb9d92491c475cec55147fa0b3f954d\n\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n---\n git-rebase.sh |    7 ++++++-\n 1 files changed, 6 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 9ad1c44..28860fc 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -59,8 +59,13 @@ continue_merge () {\n \n \tif test -n \"`git-diff-index HEAD`\"\n \tthen\n+\t\tif ! git-commit -C \"`cat $dotest/current`\"\n+\t\tthen\n+\t\t\techo \"Commit failed, please do not call \\\"git commit\\\"\"\n+\t\t\techo \"directly, but instead do one of the following: \"\n+\t\t\tdie \"$RESOLVEMSG\"\n+\t\tfi\n \t\tprintf \"Committed: %0${prec}d\" $msgnum\n-\t\tgit-commit -C \"`cat $dotest/current`\"\n \telse\n \t\tprintf \"Already applied: %0${prec}d\" $msgnum\n \tfi\n-- \n1.4.1.rc1.gc7c5\n"}]}