undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-fetch split up "(non-fast-forward)" message

Browse Source 
Split up the "(non-fast-forward)" message from printf directives and
make it translatable.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-02-22 23:41:54 +00:00 committed by Junio C Hamano
parent f7b3742a6b
commit 321a153c5a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/fetch.c
View File

@ -317,9 +317,9 @@ static int update_local_ref(struct ref *ref,
r ? _("unable to update local ref") : _("forced update"));
return r;
} else {
sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)",
TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
pretty_ref);
sprintf(display, "! %-*s %-*s -> %s %s",
TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), REFCOL_WIDTH, remote,
pretty_ref, _("(non-fast-forward)"));
return 1;
}
}