Skip to content

Commit 951eafe

Browse files
committed
Merge branch 'es/some-up-to-date-messages-must-stay'
Comment updates to help developers not to attempt to modify messages from plumbing commands that must stay constant. It might make sense to reassess the plumbing needs every few years, but that should be done as a separate effort. * es/some-up-to-date-messages-must-stay: messages: mark some strings with "up-to-date" not to touch
2 parents e02ecfc + 80bdaba commit 951eafe

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
@@ -333,6 +333,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
333333
}
334334

335335
if (!ret && !transport_refs_pushed(remote_refs))
336+
/* stable plumbing output; do not modify or localize */
336337
fprintf(stderr, "Everything up-to-date\n");
337338

338339
return ret;

http-push.c

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

18521852
if (oideq(&ref->old_oid, &ref->peer_ref->new_oid)) {
18531853
if (push_verbosely)
1854+
/* stable plumbing output; do not modify or localize */
18541855
fprintf(stderr, "'%s': up-to-date\n", ref->name);
18551856
if (helper_status)
18561857
printf("ok %s up to date\n", ref->name);
@@ -1871,6 +1872,7 @@ int cmd_main(int argc, const char **argv)
18711872
* commits at the remote end and likely
18721873
* we were not up to date to begin with.
18731874
*/
1875+
/* stable plumbing output; do not modify or localize */
18741876
error("remote '%s' is not an ancestor of\n"
18751877
"local '%s'.\n"
18761878
"Maybe you are not up-to-date and "

transport.c

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

14721473
done:

0 commit comments

Comments
 (0)