diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-12 12:19:10 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-12 10:20:01 -0800 |
| commit | 80bdaba894b9868a74fa5931e3ce1ca074353b24 (patch) | |
| tree | 955625c31e5af8bfac1c9f44c9f2ebff252a65fc | |
| parent | ec583449067bab5b800ecc63926f35c9dae96fa1 (diff) | |
| download | git-80bdaba894b9868a74fa5931e3ce1ca074353b24.tar.gz | |
messages: mark some strings with "up-to-date" not to touch
The treewide clean-up of "up-to-date" strings done in 7560f547
(treewide: correct several "up-to-date" to "up to date", 2017-08-23)
deliberately left some out, but unlike the lines that were changed
by the commit, the lines that were deliberately left untouched by
the commit is impossible to ask "git blame" to link back to the
commit that did not touch them.
Let's do the second best thing, leave a short comment near them
explaining why those strings should not be modified or localized.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
[es: make in-code comment more developer-friendly]
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/send-pack.c | 1 | ||||
| -rw-r--r-- | http-push.c | 2 | ||||
| -rw-r--r-- | transport.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 64962be016..7a750b18a7 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -338,6 +338,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) } if (!ret && !transport_refs_pushed(remote_refs)) + /* stable plumbing output; do not modify or localize */ fprintf(stderr, "Everything up-to-date\n"); return ret; diff --git a/http-push.c b/http-push.c index 7f71316456..785b319342 100644 --- a/http-push.c +++ b/http-push.c @@ -1845,6 +1845,7 @@ int cmd_main(int argc, const char **argv) if (oideq(&ref->old_oid, &ref->peer_ref->new_oid)) { if (push_verbosely) + /* stable plumbing output; do not modify or localize */ fprintf(stderr, "'%s': up-to-date\n", ref->name); if (helper_status) printf("ok %s up to date\n", ref->name); @@ -1865,6 +1866,7 @@ int cmd_main(int argc, const char **argv) * commits at the remote end and likely * we were not up to date to begin with. */ + /* stable plumbing output; do not modify or localize */ error("remote '%s' is not an ancestor of\n" "local '%s'.\n" "Maybe you are not up-to-date and " diff --git a/transport.c b/transport.c index 70e9c188a3..f5d5c22812 100644 --- a/transport.c +++ b/transport.c @@ -1419,6 +1419,7 @@ int transport_push(struct repository *r, if (porcelain && !push_ret) puts("Done"); else if (!quiet && !ret && !transport_refs_pushed(remote_refs)) + /* stable plumbing output; do not modify or localize */ fprintf(stderr, "Everything up-to-date\n"); done: |