{"thread":{"id":"52163","subject":"[PATCH 1/2] RelNotes/2.24.0: typofix","startedAt":"2019-10-30T20:21:23Z","lastAt":"2019-11-02T06:18:35Z","messageCount":7,"participants":["Elijah Newren via GitGitGadget","Taylor Blau","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"385173","messageId":"2e1ebe70820fd4cbc40df1f89779c77b9ceea881.1572466878.git.gitgitgadget@gmail.com","threadId":"52163","inReplyTo":"pull.440.git.1572466878.gitgitgadget@gmail.com","subject":"[PATCH 1/2] RelNotes/2.24.0: typofix","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-30T20:21:17Z","receivedAt":"2019-10-30T20:21:23Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nSigned-off-by: Elijah Newren \n---\n Documentation/RelNotes/2.24.0.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt\nindex b7083cd6b2..26e018078d 100644\n--- a/Documentation/RelNotes/2.24.0.txt\n+++ b/Documentation/RelNotes/2.24.0.txt\n@@ -316,7 +316,7 @@ Fixes since v2.23\n to access the worktree correctly, which has been corrected.\n (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).\n \n- * The merge-recursive machiery is one of the most complex parts of\n+ * The merge-recursive machinery is one of the most complex parts of\n the system that accumulated cruft over time. This large series\n cleans up the implementation quite a bit.\n (merge b657047719 en/merge-recursive-cleanup later to maint).\n-- \ngitgitgadget\n\n"},{"id":"385174","messageId":"pull.440.git.1572466878.gitgitgadget@gmail.com","threadId":"52163","inReplyTo":null,"subject":"[PATCH 0/2] 2.24 release note fixups","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-30T20:21:16Z","receivedAt":"2019-10-30T20:21:25Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"A couple minor fixes to the 2.24 release notes. I split into two trivial\ncommits just in case folks don't like the second (perhaps some wording about\nno current plans to remove filter-branch were intended?)\n\nElijah Newren (2):\n RelNotes/2.24.0: typofix\n RelNotes/2.24.0: fix self-contradictory note\n\n Documentation/RelNotes/2.24.0.txt | 9 ++++-----\n 1 file changed, 4 insertions(+), 5 deletions(-)\n\n\nbase-commit: f21f8f5d35b09ecdd1a0112f114436fd2eda7df2\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-440%2Fnewren%2F2.24-release-note-fixups-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-440/newren/2.24-release-note-fixups-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/440\n-- \ngitgitgadget\n"},{"id":"385175","messageId":"0f3aa67e4aafbb7befd37d83a8c0d53a0a186259.1572466878.git.gitgitgadget@gmail.com","threadId":"52163","inReplyTo":"pull.440.git.1572466878.gitgitgadget@gmail.com","subject":"[PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-30T20:21:18Z","receivedAt":"2019-10-30T20:21:26Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nAs per Wikipedia, \"In current technical usage, for one to state that a\nfeature is deprecated is merely a recommendation against using it.\" It\nis thus contradictory to claim that something is not \"officially\ndeprecated\" and then to immediately state that we are both discouraging\nits use and pointing people elsewhere.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/RelNotes/2.24.0.txt | 7 +++----\n 1 file changed, 3 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt\nindex 26e018078d..bde154124c 100644\n--- a/Documentation/RelNotes/2.24.0.txt\n+++ b/Documentation/RelNotes/2.24.0.txt\n@@ -6,10 +6,9 @@ Updates since v2.23\n \n Backward compatibility note\n \n- * Although it is not officially deprecated, \"filter-branch\" is\n- showing its age and alternatives are available. From this release,\n- we started to discourage its uses and hint people about\n- filter-repo.\n+ * \"filter-branch\" is showing its age and alternatives are available.\n+ From this release, we started to discourage its use and hint\n+ people about filter-repo.\n \n UI, Workflows & Features\n \n-- \ngitgitgadget\n"},{"id":"385290","messageId":"20191102032858.GA93209@syl.local","threadId":"52163","inReplyTo":"2e1ebe70820fd4cbc40df1f89779c77b9ceea881.1572466878.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/2] RelNotes/2.24.0: typofix","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2019-11-02T03:28:58Z","receivedAt":"2019-11-02T03:29:02Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"Hi Elijah,\n\nOn Wed, Oct 30, 2019 at 08:21:17PM +0000, Elijah Newren via GitGitGadget wrote:\n> From: Elijah Newren \n>\n> Signed-off-by: Elijah Newren \n> ---\n> Documentation/RelNotes/2.24.0.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt\n> index b7083cd6b2..26e018078d 100644\n> --- a/Documentation/RelNotes/2.24.0.txt\n> +++ b/Documentation/RelNotes/2.24.0.txt\n> @@ -316,7 +316,7 @@ Fixes since v2.23\n> to access the worktree correctly, which has been corrected.\n> (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).\n>\n> - * The merge-recursive machiery is one of the most complex parts of\n> + * The merge-recursive machinery is one of the most complex parts of\n> the system that accumulated cruft over time. This large series\n> cleans up the implementation quite a bit.\n> (merge b657047719 en/merge-recursive-cleanup later to maint).\n> --\n> gitgitgadget\n\nThanks, I hadn't noticed this when I read through the release notes\nmyself. This looks obviously good to me.\n\nThanks,\nTaylor\n"},{"id":"385291","messageId":"20191102033236.GB93209@syl.local","threadId":"52163","inReplyTo":"0f3aa67e4aafbb7befd37d83a8c0d53a0a186259.1572466878.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2019-11-02T03:32:36Z","receivedAt":"2019-11-02T03:32:41Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Wed, Oct 30, 2019 at 08:21:18PM +0000, Elijah Newren via GitGitGadget wrote:\n> From: Elijah Newren \n>\n> As per Wikipedia, \"In current technical usage, for one to state that a\n> feature is deprecated is merely a recommendation against using it.\" It\n> is thus contradictory to claim that something is not \"officially\n> deprecated\" and then to immediately state that we are both discouraging\n> its use and pointing people elsewhere.\n>\n> Signed-off-by: Elijah Newren \n> ---\n> Documentation/RelNotes/2.24.0.txt | 7 +++----\n> 1 file changed, 3 insertions(+), 4 deletions(-)\n>\n> diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt\n> index 26e018078d..bde154124c 100644\n> --- a/Documentation/RelNotes/2.24.0.txt\n> +++ b/Documentation/RelNotes/2.24.0.txt\n> @@ -6,10 +6,9 @@ Updates since v2.23\n>\n> Backward compatibility note\n>\n> - * Although it is not officially deprecated, \"filter-branch\" is\n> - showing its age and alternatives are available. From this release,\n> - we started to discourage its uses and hint people about\n> - filter-repo.\n> + * \"filter-branch\" is showing its age and alternatives are available.\n> + From this release, we started to discourage its use and hint\n> + people about filter-repo.\n\nI suspect that this change was motivated by our off-list correspondence,\nwhere I struggled to phrase a section about this in GitHub's release\nhighlights.\n\nI think that I'm mostly reflecting what Elijah has already said himself\nin another thread, but this change makes sense to me. I think that we\nhave effectively deprecated 'git-filter-branch'. If we're printing\nwarnings when it is called, and recommended that users refer to\n'git-filter-repo' instead, I think that we might as well call it\ndeprecated.\n\nBut, if that phrase is too heavy-handed for 2.24, I think that this\npatch makes a lot of sense. It's--as Elijah notes--confusing to say that\nwe recommend against using a tool but haven't 'officially' deprecated\nit. This works nicely around that issue by not using the phrase\n'deprecated' at all, and instead being clear about what the state of\n'git filter-branch' is.\n\n> UI, Workflows & Features\n>\n> --\n> gitgitgadget\n\nLooks good to me.\n\nThanks,\nTaylor\n"},{"id":"385300","messageId":"xmqqbltu4yum.fsf@gitster-ct.c.googlers.com","threadId":"52163","inReplyTo":"2e1ebe70820fd4cbc40df1f89779c77b9ceea881.1572466878.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/2] RelNotes/2.24.0: typofix","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-11-02T05:43:45Z","receivedAt":"2019-11-02T05:43:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Elijah Newren via GitGitGadget\" writes:\n\n> From: Elijah Newren \n>\n> Signed-off-by: Elijah Newren \n> ---\n> Documentation/RelNotes/2.24.0.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt\n> index b7083cd6b2..26e018078d 100644\n> --- a/Documentation/RelNotes/2.24.0.txt\n> +++ b/Documentation/RelNotes/2.24.0.txt\n> @@ -316,7 +316,7 @@ Fixes since v2.23\n> to access the worktree correctly, which has been corrected.\n> (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).\n> \n> - * The merge-recursive machiery is one of the most complex parts of\n> + * The merge-recursive machinery is one of the most complex parts of\n> the system that accumulated cruft over time. This large series\n> cleans up the implementation quite a bit.\n> (merge b657047719 en/merge-recursive-cleanup later to maint).\n\nThanks.\n"},{"id":"385307","messageId":"xmqqh83m3ioc.fsf@gitster-ct.c.googlers.com","threadId":"52163","inReplyTo":"20191102033236.GB93209@syl.local","subject":"Re: [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-11-02T06:18:27Z","receivedAt":"2019-11-02T06:18:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Taylor Blau writes:\n\n> ... It's--as Elijah notes--confusing to say that\n> we recommend against using a tool but haven't 'officially' deprecated\n> it. This works nicely around that issue by not using the phrase\n> 'deprecated' at all, and instead being clear about what the state of\n> 'git filter-branch' is.\n\nSounds sensible. Thanks, both.\n\n"}]}