зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
951eafe36f
|
@ -333,6 +333,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;
|
||||
|
|
|
@ -1851,6 +1851,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);
|
||||
|
@ -1871,6 +1872,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 "
|
||||
|
|
|
@ -1467,6 +1467,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:
|
||||
|
|
Загрузка…
Ссылка в новой задаче