{"thread":{"id":"11894","subject":"[PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option","startedAt":"2008-02-05T13:56:01Z","lastAt":"2008-02-06T02:26:32Z","messageCount":2,"participants":["Jari Aalto","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"67511","messageId":"d4rbzevi.fsf@blue.sea.net","threadId":"11894","inReplyTo":null,"subject":"[PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2008-02-05T13:56:01Z","receivedAt":"2008-02-05T13:56:01Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"Honor user settable --whitespace=<control>\n\nSigned-off-by: Jari Aalto <jari.aalto AT cante.net>\n---\n git-rebase.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex bdcea0e..ec052c4 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -174,7 +174,8 @@ do\n \t\thead_name=$(cat .dotest/head-name) &&\n \t\tonto=$(cat .dotest/onto) &&\n \t\torig_head=$(cat .dotest/orig-head) &&\n-\t\tgit am --resolved --3way --resolvemsg=\"$RESOLVEMSG\" &&\n+\t\tgit am $git_am_opt --resolved --3way \\\n+\t\t    --resolvemsg=\"$RESOLVEMSG\" &&\n \t\tmove_to_original_branch\n \t\texit\n \t\t;;\n-- \n1.5.4-rc5.GIT-dirty\n\n\n-- \nWelcome to FOSS revolution: we fix and modify until it shines\n"},{"id":"67605","messageId":"7vmyqe6crr.fsf@gitster.siamese.dyndns.org","threadId":"11894","inReplyTo":"d4rbzevi.fsf@blue.sea.net","subject":"Re: [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-06T02:26:32Z","receivedAt":"2008-02-06T02:26:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jari Aalto <jari.aalto@cante.net> writes:\n\n> Honor user settable --whitespace=<control>\n>\n> Signed-off-by: Jari Aalto <jari.aalto AT cante.net>\n> ---\n>  git-rebase.sh |    3 ++-\n>  1 files changed, 2 insertions(+), 1 deletions(-)\n>\n> diff --git a/git-rebase.sh b/git-rebase.sh\n> index bdcea0e..ec052c4 100755\n> --- a/git-rebase.sh\n> +++ b/git-rebase.sh\n> @@ -174,7 +174,8 @@ do\n>  \t\thead_name=$(cat .dotest/head-name) &&\n>  \t\tonto=$(cat .dotest/onto) &&\n>  \t\torig_head=$(cat .dotest/orig-head) &&\n> -\t\tgit am --resolved --3way --resolvemsg=\"$RESOLVEMSG\" &&\n> +\t\tgit am $git_am_opt --resolved --3way \\\n> +\t\t    --resolvemsg=\"$RESOLVEMSG\" &&\n>  \t\tmove_to_original_branch\n>  \t\texit\n>  \t\t;;\n\nActually this is a bug in git-am.  am is supposed to remember\nthe original command line options.\n\n8c31cb8 (git-am: --whitespace=x option) does it correctly, but\nlater 67dad68 (add -C[NUM] to git-am) broke it and other changes\ninherited the breakage.\n"}]}