git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/2] 2.24 release note fixups
@ 2019-10-30 20:21 Elijah Newren via GitGitGadget
  2019-10-30 20:21 ` [PATCH 1/2] RelNotes/2.24.0: typofix Elijah Newren via GitGitGadget
  2019-10-30 20:21 ` [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note Elijah Newren via GitGitGadget
  0 siblings, 2 replies; 7+ messages in thread
From: Elijah Newren via GitGitGadget @ 2019-10-30 20:21 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano

A couple minor fixes to the 2.24 release notes. I split into two trivial
commits just in case folks don't like the second (perhaps some wording about
no current plans to remove filter-branch were intended?)

Elijah Newren (2):
  RelNotes/2.24.0: typofix
  RelNotes/2.24.0: fix self-contradictory note

 Documentation/RelNotes/2.24.0.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


base-commit: f21f8f5d35b09ecdd1a0112f114436fd2eda7df2
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-440%2Fnewren%2F2.24-release-note-fixups-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-440/newren/2.24-release-note-fixups-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/440
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/2] RelNotes/2.24.0: typofix
  2019-10-30 20:21 [PATCH 0/2] 2.24 release note fixups Elijah Newren via GitGitGadget
@ 2019-10-30 20:21 ` Elijah Newren via GitGitGadget
  2019-11-02  3:28   ` Taylor Blau
  2019-11-02  5:43   ` Junio C Hamano
  2019-10-30 20:21 ` [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note Elijah Newren via GitGitGadget
  1 sibling, 2 replies; 7+ messages in thread
From: Elijah Newren via GitGitGadget @ 2019-10-30 20:21 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, Elijah Newren

From: Elijah Newren <newren@gmail.com>

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 Documentation/RelNotes/2.24.0.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
index b7083cd6b2..26e018078d 100644
--- a/Documentation/RelNotes/2.24.0.txt
+++ b/Documentation/RelNotes/2.24.0.txt
@@ -316,7 +316,7 @@ Fixes since v2.23
    to access the worktree correctly, which has been corrected.
    (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).
 
- * The merge-recursive machiery is one of the most complex parts of
+ * The merge-recursive machinery is one of the most complex parts of
    the system that accumulated cruft over time.  This large series
    cleans up the implementation quite a bit.
    (merge b657047719 en/merge-recursive-cleanup later to maint).
-- 
gitgitgadget


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note
  2019-10-30 20:21 [PATCH 0/2] 2.24 release note fixups Elijah Newren via GitGitGadget
  2019-10-30 20:21 ` [PATCH 1/2] RelNotes/2.24.0: typofix Elijah Newren via GitGitGadget
@ 2019-10-30 20:21 ` Elijah Newren via GitGitGadget
  2019-11-02  3:32   ` Taylor Blau
  1 sibling, 1 reply; 7+ messages in thread
From: Elijah Newren via GitGitGadget @ 2019-10-30 20:21 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, Elijah Newren

From: Elijah Newren <newren@gmail.com>

As per Wikipedia, "In current technical usage, for one to state that a
feature is deprecated is merely a recommendation against using it."  It
is thus contradictory to claim that something is not "officially
deprecated" and then to immediately state that we are both discouraging
its use and pointing people elsewhere.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 Documentation/RelNotes/2.24.0.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
index 26e018078d..bde154124c 100644
--- a/Documentation/RelNotes/2.24.0.txt
+++ b/Documentation/RelNotes/2.24.0.txt
@@ -6,10 +6,9 @@ Updates since v2.23
 
 Backward compatibility note
 
- * Although it is not officially deprecated, "filter-branch" is
-   showing its age and alternatives are available.  From this release,
-   we started to discourage its uses and hint people about
-   filter-repo.
+ * "filter-branch" is showing its age and alternatives are available.
+   From this release, we started to discourage its use and hint
+   people about filter-repo.
 
 UI, Workflows & Features
 
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] RelNotes/2.24.0: typofix
  2019-10-30 20:21 ` [PATCH 1/2] RelNotes/2.24.0: typofix Elijah Newren via GitGitGadget
@ 2019-11-02  3:28   ` Taylor Blau
  2019-11-02  5:43   ` Junio C Hamano
  1 sibling, 0 replies; 7+ messages in thread
From: Taylor Blau @ 2019-11-02  3:28 UTC (permalink / raw)
  To: Elijah Newren via GitGitGadget; +Cc: git, Junio C Hamano, Elijah Newren

Hi Elijah,

On Wed, Oct 30, 2019 at 08:21:17PM +0000, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  Documentation/RelNotes/2.24.0.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
> index b7083cd6b2..26e018078d 100644
> --- a/Documentation/RelNotes/2.24.0.txt
> +++ b/Documentation/RelNotes/2.24.0.txt
> @@ -316,7 +316,7 @@ Fixes since v2.23
>     to access the worktree correctly, which has been corrected.
>     (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).
>
> - * The merge-recursive machiery is one of the most complex parts of
> + * The merge-recursive machinery is one of the most complex parts of
>     the system that accumulated cruft over time.  This large series
>     cleans up the implementation quite a bit.
>     (merge b657047719 en/merge-recursive-cleanup later to maint).
> --
> gitgitgadget

Thanks, I hadn't noticed this when I read through the release notes
myself. This looks obviously good to me.

Thanks,
Taylor

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note
  2019-10-30 20:21 ` [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note Elijah Newren via GitGitGadget
@ 2019-11-02  3:32   ` Taylor Blau
  2019-11-02  6:18     ` Junio C Hamano
  0 siblings, 1 reply; 7+ messages in thread
From: Taylor Blau @ 2019-11-02  3:32 UTC (permalink / raw)
  To: Elijah Newren via GitGitGadget; +Cc: git, Junio C Hamano, Elijah Newren

On Wed, Oct 30, 2019 at 08:21:18PM +0000, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
>
> As per Wikipedia, "In current technical usage, for one to state that a
> feature is deprecated is merely a recommendation against using it."  It
> is thus contradictory to claim that something is not "officially
> deprecated" and then to immediately state that we are both discouraging
> its use and pointing people elsewhere.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  Documentation/RelNotes/2.24.0.txt | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
> index 26e018078d..bde154124c 100644
> --- a/Documentation/RelNotes/2.24.0.txt
> +++ b/Documentation/RelNotes/2.24.0.txt
> @@ -6,10 +6,9 @@ Updates since v2.23
>
>  Backward compatibility note
>
> - * Although it is not officially deprecated, "filter-branch" is
> -   showing its age and alternatives are available.  From this release,
> -   we started to discourage its uses and hint people about
> -   filter-repo.
> + * "filter-branch" is showing its age and alternatives are available.
> +   From this release, we started to discourage its use and hint
> +   people about filter-repo.

I suspect that this change was motivated by our off-list correspondence,
where I struggled to phrase a section about this in GitHub's release
highlights.

I think that I'm mostly reflecting what Elijah has already said himself
in another thread, but this change makes sense to me. I think that we
have effectively deprecated 'git-filter-branch'. If we're printing
warnings when it is called, and recommended that users refer to
'git-filter-repo' instead, I think that we might as well call it
deprecated.

But, if that phrase is too heavy-handed for 2.24, I think that this
patch makes a lot of sense. It's--as Elijah notes--confusing to say that
we recommend against using a tool but haven't 'officially' deprecated
it. This works nicely around that issue by not using the phrase
'deprecated' at all, and instead being clear about what the state of
'git filter-branch' is.

>  UI, Workflows & Features
>
> --
> gitgitgadget

Looks good to me.

Thanks,
Taylor

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] RelNotes/2.24.0: typofix
  2019-10-30 20:21 ` [PATCH 1/2] RelNotes/2.24.0: typofix Elijah Newren via GitGitGadget
  2019-11-02  3:28   ` Taylor Blau
@ 2019-11-02  5:43   ` Junio C Hamano
  1 sibling, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2019-11-02  5:43 UTC (permalink / raw)
  To: Elijah Newren via GitGitGadget; +Cc: git, Elijah Newren

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Elijah Newren <newren@gmail.com>
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  Documentation/RelNotes/2.24.0.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
> index b7083cd6b2..26e018078d 100644
> --- a/Documentation/RelNotes/2.24.0.txt
> +++ b/Documentation/RelNotes/2.24.0.txt
> @@ -316,7 +316,7 @@ Fixes since v2.23
>     to access the worktree correctly, which has been corrected.
>     (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).
>  
> - * The merge-recursive machiery is one of the most complex parts of
> + * The merge-recursive machinery is one of the most complex parts of
>     the system that accumulated cruft over time.  This large series
>     cleans up the implementation quite a bit.
>     (merge b657047719 en/merge-recursive-cleanup later to maint).

Thanks.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note
  2019-11-02  3:32   ` Taylor Blau
@ 2019-11-02  6:18     ` Junio C Hamano
  0 siblings, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2019-11-02  6:18 UTC (permalink / raw)
  To: Taylor Blau; +Cc: Elijah Newren via GitGitGadget, git, Elijah Newren

Taylor Blau <me@ttaylorr.com> writes:

> ... It's--as Elijah notes--confusing to say that
> we recommend against using a tool but haven't 'officially' deprecated
> it. This works nicely around that issue by not using the phrase
> 'deprecated' at all, and instead being clear about what the state of
> 'git filter-branch' is.

Sounds sensible.  Thanks, both.


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-11-02  6:18 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-30 20:21 [PATCH 0/2] 2.24 release note fixups Elijah Newren via GitGitGadget
2019-10-30 20:21 ` [PATCH 1/2] RelNotes/2.24.0: typofix Elijah Newren via GitGitGadget
2019-11-02  3:28   ` Taylor Blau
2019-11-02  5:43   ` Junio C Hamano
2019-10-30 20:21 ` [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note Elijah Newren via GitGitGadget
2019-11-02  3:32   ` Taylor Blau
2019-11-02  6:18     ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).