Skip to content

Commit 80bdaba

Browse files
committed
messages: mark some strings with "up-to-date" not to touch
The treewide clean-up of "up-to-date" strings done in 7560f54 (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 <[email protected]> [es: make in-code comment more developer-friendly] Signed-off-by: Eric Sunshine <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ec58344 commit 80bdaba

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

builtin/send-pack.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
338338
}
339339

340340
if (!ret && !transport_refs_pushed(remote_refs))
341+
/* stable plumbing output; do not modify or localize */
341342
fprintf(stderr, "Everything up-to-date\n");
342343

343344
return ret;

http-push.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,6 +1845,7 @@ int cmd_main(int argc, const char **argv)
18451845

18461846
if (oideq(&ref->old_oid, &ref->peer_ref->new_oid)) {
18471847
if (push_verbosely)
1848+
/* stable plumbing output; do not modify or localize */
18481849
fprintf(stderr, "'%s': up-to-date\n", ref->name);
18491850
if (helper_status)
18501851
printf("ok %s up to date\n", ref->name);
@@ -1865,6 +1866,7 @@ int cmd_main(int argc, const char **argv)
18651866
* commits at the remote end and likely
18661867
* we were not up to date to begin with.
18671868
*/
1869+
/* stable plumbing output; do not modify or localize */
18681870
error("remote '%s' is not an ancestor of\n"
18691871
"local '%s'.\n"
18701872
"Maybe you are not up-to-date and "

transport.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,6 +1419,7 @@ int transport_push(struct repository *r,
14191419
if (porcelain && !push_ret)
14201420
puts("Done");
14211421
else if (!quiet && !ret && !transport_refs_pushed(remote_refs))
1422+
/* stable plumbing output; do not modify or localize */
14221423
fprintf(stderr, "Everything up-to-date\n");
14231424

14241425
done:

0 commit comments

Comments
 (0)