{"thread":{"id":"45048","subject":"[PATCH v3] parse-remote: remove reference to unused op_prep","startedAt":"2017-02-04T14:31:26Z","lastAt":"2017-02-06T18:17:51Z","messageCount":4,"participants":["Siddharth Kannan","Pranit Bauva","Junio C Hamano"],"isPatch":true,"patchVersion":3,"patchTotal":null},"messages":[{"id":"310856","messageId":"1486218663-31820-1-git-send-email-kannan.siddharth12@gmail.com","threadId":"45048","inReplyTo":null,"subject":"[PATCH v3] parse-remote: remove reference to unused op_prep","fromName":"Siddharth Kannan","fromEmail":"kannan.siddharth12@gmail.com","sentAt":"2017-02-04T14:31:03Z","receivedAt":"2017-02-04T14:31:26Z","isPatch":true,"sender":{"key":"kannan.siddharth12@gmail.com","avatar":"https://gravatar.com/avatar/f555b34abc9cec49fd7e7ca4a55b58be0e0af0fc58e75b7887210199b7d4ca5a?d=mp&s=160"},"body":"The error_on_missing_default_upstream helper function learned to\ntake op_prep argument with 15a147e618 (\"rebase: use @{upstream}\nif no upstream specified\", 2011-02-09), but as of 045fac5845\n(\"i18n: git-parse-remote.sh: mark strings for translation\",\n 2016-04-19), the argument is no longer used. Remove it.\n\nSigned-off-by: Siddharth Kannan \n---\nThanks a lot for the review, Pranit and Junio! I have made the appropriate\nchanges, and the edit to the file inside contrib/examples/ has been removed from\nthis patch.\n\n git-parse-remote.sh | 3 +--\n git-rebase.sh | 2 +-\n 2 files changed, 2 insertions(+), 3 deletions(-)\n\ndiff --git a/git-parse-remote.sh b/git-parse-remote.sh\nindex d3c3998..9698a05 100644\n--- a/git-parse-remote.sh\n+++ b/git-parse-remote.sh\n@@ -56,8 +56,7 @@ get_remote_merge_branch () {\n error_on_missing_default_upstream () {\n \tcmd=\"$1\"\n \top_type=\"$2\"\n-\top_prep=\"$3\" # FIXME: op_prep is no longer used\n-\texample=\"$4\"\n+\texample=\"$3\"\n \tbranch_name=$(git symbolic-ref -q HEAD)\n \tdisplay_branch_name=\"${branch_name#refs/heads/}\"\n \t# If there's only one remote, use that in the suggestion\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 04f6e44..b89f960 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -448,7 +448,7 @@ then\n \t\tthen\n \t\t\t. git-parse-remote\n \t\t\terror_on_missing_default_upstream \"rebase\" \"rebase\" \\\n-\t\t\t\t\"against\" \"git rebase $(gettext '')\"\n+\t\t\t\t\"git rebase $(gettext '')\"\n \t\tfi\n \n \t\ttest \"$fork_point\" = auto && fork_point=t\n-- \n2.1.4\n\n"},{"id":"310860","messageId":"CAFZEwPOdL4mOAnmTUqs5LmfdG2GQCieVGVQ7T3ZWR0n+d6tCQQ@mail.gmail.com","threadId":"45048","inReplyTo":"1486218663-31820-1-git-send-email-kannan.siddharth12@gmail.com","subject":"Re: [PATCH v3] parse-remote: remove reference to unused op_prep","fromName":"Pranit Bauva","fromEmail":"pranit.bauva@gmail.com","sentAt":"2017-02-04T21:15:46Z","receivedAt":"2017-02-04T21:16:05Z","isPatch":true,"sender":{"key":"pranit.bauva@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2959938?v=4"},"body":"Hey Siddharth,\n\nOn Sat, Feb 4, 2017 at 8:01 PM, Siddharth Kannan\n wrote:\n> The error_on_missing_default_upstream helper function learned to\n> take op_prep argument with 15a147e618 (\"rebase: use @{upstream}\n> if no upstream specified\", 2011-02-09), but as of 045fac5845\n> (\"i18n: git-parse-remote.sh: mark strings for translation\",\n> 2016-04-19), the argument is no longer used. Remove it.\n>\n> Signed-off-by: Siddharth Kannan \n\nThis looks good to me! Thanks :)\n\nRegards,\nPranit Bauva\n"},{"id":"310896","messageId":"20170206022804.GB3323@ubuntu-512mb-blr1-01.localdomain","threadId":"45048","inReplyTo":"CAFZEwPOdL4mOAnmTUqs5LmfdG2GQCieVGVQ7T3ZWR0n+d6tCQQ@mail.gmail.com","subject":"Re: [PATCH v3] parse-remote: remove reference to unused op_prep","fromName":"Siddharth Kannan","fromEmail":"kannan.siddharth12@gmail.com","sentAt":"2017-02-06T02:28:04Z","receivedAt":"2017-02-06T02:28:12Z","isPatch":true,"sender":{"key":"kannan.siddharth12@gmail.com","avatar":"https://gravatar.com/avatar/f555b34abc9cec49fd7e7ca4a55b58be0e0af0fc58e75b7887210199b7d4ca5a?d=mp&s=160"},"body":"Hey Pranit,\nOn Sun, Feb 05, 2017 at 02:45:46AM +0530, Pranit Bauva wrote:\n> Hey Siddharth,\n> \n> On Sat, Feb 4, 2017 at 8:01 PM, Siddharth Kannan\n> wrote:\n> > The error_on_missing_default_upstream helper function learned to\n> > take op_prep argument with 15a147e618 (\"rebase: use @{upstream}\n> > if no upstream specified\", 2011-02-09), but as of 045fac5845\n> > (\"i18n: git-parse-remote.sh: mark strings for translation\",\n> > 2016-04-19), the argument is no longer used. Remove it.\n> >\n> > Signed-off-by: Siddharth Kannan \n> \n> This looks good to me! Thanks :)\n> \n> Regards,\n> Pranit Bauva\n\nShould I send this patch with \"To:\" set to Junio and \"Cc:\" set to the\nmailing list, as mentioend in the SubmittingPatches document?\n\n- Siddharth Kannan\n"},{"id":"310928","messageId":"xmqqefzb2ngd.fsf@gitster.mtv.corp.google.com","threadId":"45048","inReplyTo":"20170206022804.GB3323@ubuntu-512mb-blr1-01.localdomain","subject":"Re: [PATCH v3] parse-remote: remove reference to unused op_prep","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-02-06T18:17:38Z","receivedAt":"2017-02-06T18:17:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Siddharth Kannan writes:\n\n> Hey Pranit,\n> On Sun, Feb 05, 2017 at 02:45:46AM +0530, Pranit Bauva wrote:\n>> Hey Siddharth,\n>> \n>> On Sat, Feb 4, 2017 at 8:01 PM, Siddharth Kannan\n>> wrote:\n>> > The error_on_missing_default_upstream helper function learned to\n>> > take op_prep argument with 15a147e618 (\"rebase: use @{upstream}\n>> > if no upstream specified\", 2011-02-09), but as of 045fac5845\n>> > (\"i18n: git-parse-remote.sh: mark strings for translation\",\n>> > 2016-04-19), the argument is no longer used. Remove it.\n>> >\n>> > Signed-off-by: Siddharth Kannan \n>> \n>> This looks good to me! Thanks :)\n>> \n>> Regards,\n>> Pranit Bauva\n>\n> Should I send this patch with \"To:\" set to Junio and \"Cc:\" set to the\n> mailing list, as mentioend in the SubmittingPatches document?\n\nNah, I was watching the discussion from the sideline. I'll pick it\nup after doing one final read on the patch myself.\n\nThanks, both.\n"}]}