[PATCH] Use 'Everything up to date.' instead of 'Everything up-to-date'

[PATCH] Use 'Everything up to date.' instead of 'Everything up-to-date'

[Jay Berry via GitGitGadget]

From: Jay Berry <jb2170@selfadjointoperator.com>

There are two hard-coded
`fprintf(stderr, "Everything up-to-date\n")`
which I have changed to
`fprintf(stderr, "Everything up to date.\n")`
since most other strings used localised versions of `up to date.`

Before (stupidly inconsistent):
```
$ git pull
Already up to date.
$ git push
Everything up-to-date
```
After (consistent):
```
$ git pull
Already up to date.
$ git push
Everything up to date.
```
Signed-off-by: Jay Berry <jb2170@selfadjointoperator.com>
---
    Use 'Everything up to date.' instead of 'Everything up-to-date'
    
    There are two hard-coded fprintf(stderr, "Everything up-to-date\n")
    which I have changed to fprintf(stderr, "Everything up to date.\n")
    since most other strings used localised versions of up to date.
    
    Before (stupidly inconsistent):
    
    $ git pull
    Already up to date.
    $ git push
    Everything up-to-date
    
    
    After (consistent):
    
    $ git pull
    Already up to date.
    $ git push
    Everything up to date.
    
    
    Signed-off-by: Jay Berry jb2170@selfadjointoperator.com

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1298%2FSelfAdjointOperator%2Fup-to-date-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1298/SelfAdjointOperator/up-to-date-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1298

 builtin/send-pack.c | 2 +-
 transport.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 64962be0168..cb3c6ff8300 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -338,7 +338,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
 	}
 
 	if (!ret && !transport_refs_pushed(remote_refs))
-		fprintf(stderr, "Everything up-to-date\n");
+		fprintf(stderr, "Everything up to date.\n");
 
 	return ret;
 }
diff --git a/transport.c b/transport.c
index 52db7a3cb09..c40d15647ff 100644
--- a/transport.c
+++ b/transport.c
@@ -1416,7 +1416,7 @@ int transport_push(struct repository *r,
 	if (porcelain && !push_ret)
 		puts("Done");
 	else if (!quiet && !ret && !transport_refs_pushed(remote_refs))
-		fprintf(stderr, "Everything up-to-date\n");
+		fprintf(stderr, "Everything up to date.\n");
 
 done:
 	free_refs(local_refs);

base-commit: e72d93e88cb20b06e88e6e7d81bd1dc4effe453f
-- 
gitgitgadget

Re: [PATCH] Use 'Everything up to date.' instead of 'Everything up-to-date'

[Ævar Arnfjörð Bjarmason]

On Wed, Jul 27 2022, Jay Berry via GitGitGadget wrote:

> From: Jay Berry <jb2170@selfadjointoperator.com>
>
> There are two hard-coded
> `fprintf(stderr, "Everything up-to-date\n")`
> which I have changed to
> `fprintf(stderr, "Everything up to date.\n")`
> since most other strings used localised versions of `up to date.`
>
> Before (stupidly inconsistent):
> ```
> $ git pull
> Already up to date.
> $ git push
> Everything up-to-date
> ```
> After (consistent):
> ```
> $ git pull
> Already up to date.
> $ git push
> Everything up to date.
> ```
> Signed-off-by: Jay Berry <jb2170@selfadjointoperator.com>
> ---
>     Use 'Everything up to date.' instead of 'Everything up-to-date'
>     
>     There are two hard-coded fprintf(stderr, "Everything up-to-date\n")
>     which I have changed to fprintf(stderr, "Everything up to date.\n")
>     since most other strings used localised versions of up to date.
>     
>     Before (stupidly inconsistent):
>     
>     $ git pull
>     Already up to date.
>     $ git push
>     Everything up-to-date
>     
>     
>     After (consistent):
>     
>     $ git pull
>     Already up to date.
>     $ git push
>     Everything up to date.
>     
>     
>     Signed-off-by: Jay Berry jb2170@selfadjointoperator.com
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1298%2FSelfAdjointOperator%2Fup-to-date-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1298/SelfAdjointOperator/up-to-date-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1298
>
>  builtin/send-pack.c | 2 +-
>  transport.c         | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/send-pack.c b/builtin/send-pack.c
> index 64962be0168..cb3c6ff8300 100644
> --- a/builtin/send-pack.c
> +++ b/builtin/send-pack.c
> @@ -338,7 +338,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
>  	}
>  
>  	if (!ret && !transport_refs_pushed(remote_refs))
> -		fprintf(stderr, "Everything up-to-date\n");
> +		fprintf(stderr, "Everything up to date.\n");
>  
>  	return ret;
>  }
> diff --git a/transport.c b/transport.c
> index 52db7a3cb09..c40d15647ff 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -1416,7 +1416,7 @@ int transport_push(struct repository *r,
>  	if (porcelain && !push_ret)
>  		puts("Done");
>  	else if (!quiet && !ret && !transport_refs_pushed(remote_refs))
> -		fprintf(stderr, "Everything up-to-date\n");
> +		fprintf(stderr, "Everything up to date.\n");

We don't want to take this change for the reasons discussed previously here:

	https://lore.kernel.org/git/CAPig+cRRxYmFqYimTHSi9uzmWU0FRXQ2hGXJK6jYLJcsFce_Rw@mail.gmail.com/
	https://lore.kernel.org/git/20191122180433.GA57478@generichostname/

That "don't" is up for discussion, but a subsequent re-roll should argue
it based on the points raised there.

If we *are* going to change this then:

 * We should mark this for translation with _()
 * Don't have the translation include the \n

Re: [PATCH] Use 'Everything up to date.' instead of 'Everything up-to-date'

[Paul Smith]

On Wed, 2022-07-27 at 11:15 +0200, Ævar Arnfjörð Bjarmason wrote:
> That "don't" is up for discussion, but a subsequent re-roll should
> argue it based on the points raised there.
> 
> If we *are* going to change this then:
> 
>  * We should mark this for translation with _()
>  * Don't have the translation include the \n

If no change to the text is wanted, then maybe a patch should be
applied that adds a comment to the code saying that these strings are
left as-is and not localized intentionally, to avoid similar issues in
the future.

Re: [PATCH] Use 'Everything up to date.' instead of 'Everything up-to-date'

[Johannes Schindelin]

[-- Attachment #1: Type: text/plain, Size: 1523 bytes --]

Hi Paul,

On Wed, 27 Jul 2022, Paul Smith wrote:

> On Wed, 2022-07-27 at 11:15 +0200, Ævar Arnfjörð Bjarmason wrote:
> > That "don't" is up for discussion, but a subsequent re-roll should
> > argue it based on the points raised there.
> >
> > If we *are* going to change this then:
> >
> >  * We should mark this for translation with _()
> >  * Don't have the translation include the \n
>
> If no change to the text is wanted, then maybe a patch should be
> applied that adds a comment to the code saying that these strings are
> left as-is and not localized intentionally, to avoid similar issues in
> the future.

Matthias Aßauer said it best at
https://github.com/gitgitgadget/git/pull/1298#issuecomment-1196410927:

	These two are plumbing messages that where intentionally left out
	of the last effort to correct uses of "up-to-date" to "up to date"
	faf420e05a9 (treewide: correct several "up-to-date" to "up to
	date", 2017-08-23), 7560f547e61 (treewide: correct several
	"up-to-date" to "up to date", 2017-08-23).

This makes it not only clear why they have not been changed, but also why
they are not translated: those messages are not intended for human eyes,
but for programs to parse.

I like the suggestion very much to add comments above these two remaining
dashed "up-to-date"s. Paul, would you mind coalescing the information you
received into a commit message, adding the comments instead of changing
the messages, and submit the next iteration?

Thanks,
Dscho