{"thread":{"id":"44229","subject":"[PATCH] push: Re-include \"push.default=tracking\" in the documentation","startedAt":"2016-10-06T08:49:52Z","lastAt":"2017-03-20T18:02:23Z","messageCount":8,"participants":["Ævar Arnfjörð Bjarmason","Johan Herland","Matthieu Moy","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"303461","messageId":"20161006084905.14944-1-avarab@gmail.com","threadId":"44229","inReplyTo":null,"subject":"[PATCH] push: Re-include \"push.default=tracking\" in the documentation","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2016-10-06T08:49:05Z","receivedAt":"2016-10-06T08:49:52Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change the documentation for push.tracking=* to re-include a mention\nof what \"tracking\" does.\n\nThe \"tracking\" option was renamed to \"upstream\" back in\n53c4031 (\"push.default: Rename 'tracking' to 'upstream'\", 2011-02-16),\nthis section was then subsequently rewritten in 87a70e4 (\"config doc:\nrewrite push.default section\", 2013-06-19) to remove any mention of\n\"tracking\".\n\nMaybe we should just warn or die nowadays if this option is in the\nconfig, but I had some old config of mine use this option, I'd\nforgotten that it was a synonym, and nothing in git's documentation\nmentioned that.\n\nThat's bad, either we shouldn't support it at all, or we should\ndocument what it does. This patch does the latter.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n Documentation/config.txt | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 32f065c..f30d52a 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -2344,6 +2344,10 @@ push.default::\n pushing to the same repository you would normally pull from\n (i.e. central workflow).\n \n+* `tracking` - Deprecated synonym for `upstream`, which we still\n+ support for backwards compatibility with existing configuration\n+ files.\n+\n * `simple` - in centralized workflow, work like `upstream` with an\n added safety to refuse to push if the upstream branch's name is\n different from the local one.\n-- \n2.9.3\n\n"},{"id":"303473","messageId":"CALKQrgeBwT=20CRysy55VwymaWqVKEqPYexviiiZG4HZxS9_nQ@mail.gmail.com","threadId":"44229","inReplyTo":"20161006084905.14944-1-avarab@gmail.com","subject":"Re: [PATCH] push: Re-include \"push.default=tracking\" in the documentation","fromName":"Johan Herland","fromEmail":"johan@herland.net","sentAt":"2016-10-06T09:13:26Z","receivedAt":"2016-10-06T09:54:22Z","isPatch":true,"sender":{"key":"johan@herland.net","avatar":"https://avatars.githubusercontent.com/u/547031?v=4"},"body":"On Thu, Oct 6, 2016 at 10:49 AM, Ævar Arnfjörð Bjarmason\n wrote:\n> Change the documentation for push.tracking=* to re-include a mention\n> of what \"tracking\" does.\n>\n> The \"tracking\" option was renamed to \"upstream\" back in\n> 53c4031 (\"push.default: Rename 'tracking' to 'upstream'\", 2011-02-16),\n> this section was then subsequently rewritten in 87a70e4 (\"config doc:\n> rewrite push.default section\", 2013-06-19) to remove any mention of\n> \"tracking\".\n>\n> Maybe we should just warn or die nowadays if this option is in the\n> config, but I had some old config of mine use this option, I'd\n> forgotten that it was a synonym, and nothing in git's documentation\n> mentioned that.\n>\n> That's bad, either we shouldn't support it at all, or we should\n> document what it does. This patch does the latter.\n>\n> Signed-off-by: Ævar Arnfjörð Bjarmason \n\nAcked-by: Johan Herland \n\n\n-- \nJohan Herland, \nwww.herland.net\n"},{"id":"303478","messageId":"vpq1sztsmji.fsf@anie.imag.fr","threadId":"44229","inReplyTo":"20161006084905.14944-1-avarab@gmail.com","subject":"Re: [PATCH] push: Re-include \"push.default=tracking\" in the documentation","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2016-10-06T12:13:21Z","receivedAt":"2016-10-06T12:13:41Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> That's bad, either we shouldn't support it at all, or we should\n> document what it does. This patch does the latter.\n\nI vaguely remember a similar discussion and probably even a patch in the\npast (maybe by you actually). I think the proposal was to add a mention\nof tracking but avoid promoting it at the same level as the others.\n\nI have a slight preference for a patch adding stg like \"`tracking` is a\ndeprecated alias supported only for backward compatibility\" to the item\nof `upstream`, but I'm OK with the current patch too.\n\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -2344,6 +2344,10 @@ push.default::\n> pushing to the same repository you would normally pull from\n> (i.e. central workflow).\n> \n> +* `tracking` - Deprecated synonym for `upstream`, which we still\n> + support for backwards compatibility with existing configuration\n> + files.\n\nNit: I think the doc normally doesn't use \"we\" this way (we = the Git\ndevelopers or the Git tool). Hence my s/which we still support/still\nsupported/ above.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"303495","messageId":"CACBZZX5ycZbFrrVgr4PVy5pKQDbnvmvDxuephx7-uHzzcm3u=g@mail.gmail.com","threadId":"44229","inReplyTo":"vpq1sztsmji.fsf@anie.imag.fr","subject":"Re: [PATCH] push: Re-include \"push.default=tracking\" in the documentation","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2016-10-06T16:18:18Z","receivedAt":"2016-10-06T16:18:46Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Thu, Oct 6, 2016 at 2:13 PM, Matthieu Moy\n wrote:\n> Ęvar Arnfjörš Bjarmason writes:\n>\n>> That's bad, either we shouldn't support it at all, or we should\n>> document what it does. This patch does the latter.\n>\n> I vaguely remember a similar discussion and probably even a patch in the\n> past (maybe by you actually). I think the proposal was to add a mention\n> of tracking but avoid promoting it at the same level as the others.\n>\n> I have a slight preference for a patch adding stg like \"`tracking` is a\n> deprecated alias supported only for backward compatibility\" to the item\n> of `upstream`, but I'm OK with the current patch too.\n\nYou're right! I wasn't trying to be sneaky here, but apparently I just\nkeep running into the same things. We talked about this back in 2012,\nkicked off by you proposing a patch to remove it completely from\nconfig.txt and me submitting this:\nhttp://www.spinics.net/lists/git/msg198264.html\n\nAfter some back & forth Junio ended up applying fa23348 to address\nthat, but that was wiped away just a few months later in 87a70e4.\n\nI'd just like it mentioned in the docs in some way, because I *did*\nrun into exactly the situation I described in my E-Mail back in 2012,\ni.e. found a repo with push.default=tracking and couldn't find any\nmention of what it did in the docs.\n\nJunio, looks like from the 2013 discussion that you preferred just\nhaving that mention in parenthesis instead of its own item, how about\njust re-applying your fa23348 (with conflicts resolved)?\n\n>> --- a/Documentation/config.txt\n>> +++ b/Documentation/config.txt\n>> @@ -2344,6 +2344,10 @@ push.default::\n>> pushing to the same repository you would normally pull from\n>> (i.e. central workflow).\n>>\n>> +* `tracking` - Deprecated synonym for `upstream`, which we still\n>> + support for backwards compatibility with existing configuration\n>> + files.\n>\n> Nit: I think the doc normally doesn't use \"we\" this way (we = the Git\n> developers or the Git tool). Hence my s/which we still support/still\n> supported/ above.\n>\n> --\n> Matthieu Moy\n> http://www-verimag.imag.fr/~moy/\n"},{"id":"303497","messageId":"vpqlgy1h28g.fsf@anie.imag.fr","threadId":"44229","inReplyTo":"CACBZZX5ycZbFrrVgr4PVy5pKQDbnvmvDxuephx7-uHzzcm3u=g@mail.gmail.com","subject":"Re: [PATCH] push: Re-include \"push.default=tracking\" in the documentation","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2016-10-06T16:27:27Z","receivedAt":"2016-10-06T16:28:03Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> Junio, looks like from the 2013 discussion that you preferred just\n> having that mention in parenthesis instead of its own item, how about\n> just re-applying your fa23348 (with conflicts resolved)?\n\n(fa23348 did this:\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1749,7 +1749,8 @@ push.default::\n +\n This is currently the default, but Git 2.0 will change the default\n to `simple`.\n-* `upstream` - push the current branch to its upstream branch.\n+* `upstream` - push the current branch to its upstream branch\n+ (`tracking` is a deprecated synonym for this).\n)\n\nI agree that doing the same thing is the best option.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"303508","messageId":"xmqqint5l4i9.fsf@gitster.mtv.corp.google.com","threadId":"44229","inReplyTo":"vpqlgy1h28g.fsf@anie.imag.fr","subject":"Re: [PATCH] push: Re-include \"push.default=tracking\" in the documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-10-06T18:24:46Z","receivedAt":"2016-10-06T18:25:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> Ævar Arnfjörð Bjarmason writes:\n>\n>> Junio, looks like from the 2013 discussion that you preferred just\n>> having that mention in parenthesis instead of its own item, how about\n>> just re-applying your fa23348 (with conflicts resolved)?\n>\n> (fa23348 did this:\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -1749,7 +1749,8 @@ push.default::\n> +\n> This is currently the default, but Git 2.0 will change the default\n> to `simple`.\n> -* `upstream` - push the current branch to its upstream branch.\n> +* `upstream` - push the current branch to its upstream branch\n> + (`tracking` is a deprecated synonym for this).\n> )\n>\n> I agree that doing the same thing is the best option.\n\nSorry, I wasn't paying attention to this thread. \n\nIt seems that 87a70e4ce8 (\"config doc: rewrite push.default\nsection\", 2013-06-19) removed that mention by accident? The log\nmessage of the commit does not say it actively wanted to remove\nmention of `tracking` and/or why it wanted to do so, so I agree that\nresurrecting that parenthetical mention is the easiest course of\naction at this point.\n\nHowever.\n\nWith today's description of push.default choices, each of which is a\nfull fledged paragraph, I no longer have the objection I had in\n\n https://public-inbox.org/git/7vip6dgmx2.fsf@alter.siamese.dyndns.org/\n\nagainst having `tracking` as a separate bullet item. If we add\n\n * `tracking` - a deprecated synonym for `upstream`; do not use this.\n\nto today's list, it would stand out as something different from\nothers and it will not cause the confusion I feared in the\ndiscussion we had in early 2013. As Jonathan Nieder argued in the\nthread back then, having it as one of the bullet point would help\npeople locate it without using \"search\" \\C-s or / feature.\n\n\n\n"},{"id":"314595","messageId":"20170319143636.23810-1-avarab@gmail.com","threadId":"44229","inReplyTo":"xmqqint5l4i9.fsf@gitster.mtv.corp.google.com","subject":"[PATCH v2] push: Re-include \"push.default=tracking\" in the documentation","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2017-03-19T14:36:36Z","receivedAt":"2017-03-19T14:43:56Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change the documentation for push.tracking=* to re-include a mention\nof what \"tracking\" does.\n\nThe \"tracking\" option was renamed to \"upstream\" back in\n53c4031 (\"push.default: Rename 'tracking' to 'upstream'\", 2011-02-16),\nthis section was then subsequently rewritten in 87a70e4 (\"config doc:\nrewrite push.default section\", 2013-06-19) to remove any mention of\n\"tracking\".\n\nMaybe we should just warn or die nowadays if this option is in the\nconfig, but I had some old config of mine use this option, I'd\nforgotten that it was a synonym, and nothing in git's documentation\nmentioned that.\n\nThat's bad, either we shouldn't support it at all, or we should\ndocument what it does. This patch does the latter.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n\nOn Thu, Oct 6, 2016 at 8:24 PM, Junio C Hamano wrote:\n> Sorry, I wasn't paying attention to this thread.\n\nAnd neither was I it would appear, and for a much longer time...\n\n> It seems that 87a70e4ce8 (\"config doc: rewrite push.default\n> section\", 2013-06-19) removed that mention by accident? The log\n> message of the commit does not say it actively wanted to remove\n> mention of `tracking` and/or why it wanted to do so, so I agree that\n> resurrecting that parenthetical mention is the easiest course of\n> action at this point.\n>\n> However.\n>\n> With today's description of push.default choices, each of which is a\n> full fledged paragraph, I no longer have the objection I had in\n>\n> https://public-inbox.org/git/7vip6dgmx2.fsf@alter.siamese.dyndns.org/\n>\n> against having `tracking` as a separate bullet item. If we add\n>\n> * `tracking` - a deprecated synonym for `upstream`; do not use this.\n>\n> to today's list, it would stand out as something different from\n> others and it will not cause the confusion I feared in the\n> discussion we had in early 2013. As Jonathan Nieder argued in the\n> thread back then, having it as one of the bullet point would help\n> people locate it without using \"search\" \\C-s or / feature.\n\nMakes senes. Here's a re-send that fixes this. I slighly changed the\nwording you suggested to be consistent with the other existing cases\nin config.txt:\n \n 5 matches for \"eprecated.*for\" in buffer: config.txt\n 2328:\tThis is a deprecated synonym for `repack.writeBitmaps`.\n 2462:* `tracking` - This is a deprecated synonym for `upstream`.\n 2813:\tDeprecated alias for 'sendemail.smtpEncryption = ssl'.\n 2853:\tDeprecated alias for `sendemail.signedoffbycc`.\n 3180:\tDeprecated alias for `versionsort.suffix`. Ignored if\n\n Documentation/config.txt | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex eccc012672..988659e16c 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -2459,6 +2459,8 @@ push.default::\n pushing to the same repository you would normally pull from\n (i.e. central workflow).\n \n+* `tracking` - This is a deprecated synonym for `upstream`.\n+\n * `simple` - in centralized workflow, work like `upstream` with an\n added safety to refuse to push if the upstream branch's name is\n different from the local one.\n-- \n2.11.0\n\n"},{"id":"314695","messageId":"xmqqfui7x1xl.fsf@gitster.mtv.corp.google.com","threadId":"44229","inReplyTo":"20170319143636.23810-1-avarab@gmail.com","subject":"Re: [PATCH v2] push: Re-include \"push.default=tracking\" in the documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-03-20T18:01:26Z","receivedAt":"2017-03-20T18:02:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index eccc012672..988659e16c 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -2459,6 +2459,8 @@ push.default::\n> pushing to the same repository you would normally pull from\n> (i.e. central workflow).\n> \n> +* `tracking` - This is a deprecated synonym for `upstream`.\n> +\n> * `simple` - in centralized workflow, work like `upstream` with an\n> added safety to refuse to push if the upstream branch's name is\n> different from the local one.\n\nThanks for following through ;-) Will queue.\n\n"}]}