{"thread":{"id":"4691","subject":"[PATCH 2/2] rebase: get rid of outdated MRESOLVEMSG","startedAt":"2006-06-28T09:11:05Z","lastAt":"2006-06-28T09:25:29Z","messageCount":3,"participants":["Eric Wong","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"22718","messageId":"11514858662929-git-send-email-normalperson@yhbt.net","threadId":"4691","inReplyTo":null,"subject":"[PATCH 1/2] rebase: check for errors from git-commit","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-06-28T09:11:05Z","receivedAt":"2006-06-28T09:11:05Z","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\n I've grown used to having 'set -e' at the beginning of my shell\n scripts.  IMHO it'd be a good idea to start moving towards this\n eventually (even though shell scripts seem to be getting phased-out\n somewhat).\n\n git-rebase.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 9ad1c44..47c8e8f 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -59,8 +59,8 @@ continue_merge () {\n \n \tif test -n \"`git-diff-index HEAD`\"\n \tthen\n+\t\tgit-commit -C \"`cat $dotest/current`\" || die 'Commit failed'\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.g3cc8\n"},{"id":"22717","messageId":"11514858673382-git-send-email-normalperson@yhbt.net","threadId":"4691","inReplyTo":"11514858662929-git-send-email-normalperson@yhbt.net","subject":"[PATCH 2/2] rebase: get rid of outdated MRESOLVEMSG","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-06-28T09:11:06Z","receivedAt":"2006-06-28T09:11:06Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"There was a time when rebase --skip didn't work when used with\n--merge, but that is no more so we don't need that message\nanymore.\n\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n---\n git-rebase.sh |   11 +++--------\n 1 files changed, 3 insertions(+), 8 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 47c8e8f..16fe6e0 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -34,11 +34,6 @@ When you have resolved this problem run \n If you would prefer to skip this patch, instead run \\\"git rebase --skip\\\".\n To restore the original branch and stop rebasing run \\\"git rebase --abort\\\".\n \"\n-\n-MRESOLVEMSG=\"\n-When you have resolved this problem run \\\"git rebase --continue\\\".\n-To restore the original branch and stop rebasing run \\\"git rebase --abort\\\".\n-\"\n unset newbase\n strategy=recursive\n do_merge=\n@@ -54,7 +49,7 @@ continue_merge () {\n \tthen\n \t\techo \"You still have unmerged paths in your index\"\n \t\techo \"did you forget update-index?\"\n-\t\tdie \"$MRESOLVEMSG\"\n+\t\tdie \"$RESOLVEMSG\"\n \tfi\n \n \tif test -n \"`git-diff-index HEAD`\"\n@@ -87,11 +82,11 @@ call_merge () {\n \t\t;;\n \t1)\n \t\ttest -d \"$GIT_DIR/rr-cache\" && git-rerere\n-\t\tdie \"$MRESOLVEMSG\"\n+\t\tdie \"$RESOLVEMSG\"\n \t\t;;\n \t2)\n \t\techo \"Strategy: $rv $strategy failed, try another\" 1>&2\n-\t\tdie \"$MRESOLVEMSG\"\n+\t\tdie \"$RESOLVEMSG\"\n \t\t;;\n \t*)\n \t\tdie \"Unknown exit code ($rv) from command:\" \\\n-- \n1.4.1.rc1.g3cc8\n"},{"id":"22723","messageId":"7v1wt94oom.fsf@assigned-by-dhcp.cox.net","threadId":"4691","inReplyTo":"11514858662929-git-send-email-normalperson@yhbt.net","subject":"Re: [PATCH 1/2] rebase: check for errors from git-commit","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-06-28T09:25:29Z","receivedAt":"2006-06-28T09:25:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Wong <normalperson@yhbt.net> writes:\n\n>  I've grown used to having 'set -e' at the beginning of my shell\n>  scripts.  IMHO it'd be a good idea to start moving towards this\n>  eventually (even though shell scripts seem to be getting phased-out\n>  somewhat).\n>\n>  git-rebase.sh |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/git-rebase.sh b/git-rebase.sh\n> index 9ad1c44..47c8e8f 100755\n> --- a/git-rebase.sh\n> +++ b/git-rebase.sh\n> @@ -59,8 +59,8 @@ continue_merge () {\n>  \n>  \tif test -n \"`git-diff-index HEAD`\"\n>  \tthen\n> +\t\tgit-commit -C \"`cat $dotest/current`\" || die 'Commit failed'\n>  \t\tprintf \"Committed: %0${prec}d\" $msgnum\n> -\t\tgit-commit -C \"`cat $dotest/current`\"\n\nAnticipating failure from \"git-commit\" is the right thing to do,\nbut this is a \"Now what?\" situation.  What is the expected\ncourse of action to recover from this for the end user, and how\ncan we phrase the error message to help that process?\n"}]}