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

i18n: git-revert split up "could not revert/apply" message

Browse Source 
Split up the "could not %s %s... %s" message into "could not revert
%s... %s" and "could not apply %s... %s". This makes it easier for
translators to understand the message.

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:42:31 +00:00 committed by Junio C Hamano
parent b9c993e017
commit cb6aeb22ac
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/revert.c
View File

@ -536,8 +536,9 @@ static int do_pick_commit(void)
} }
if (res) { if (res) {
error("could not %s %s... %s", error(action == REVERT
action == REVERT ? "revert" : "apply", ? _("could not revert %s... %s")
: _("could not apply %s... %s"),
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
msg.subject); msg.subject);
print_advice(); print_advice();

2
t/t3507-cherry-pick-conflict.sh
View File

@ -38,7 +38,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
test "$head" = "$newhead" test "$head" = "$newhead"
' '
test_expect_success 'advice from failed cherry-pick' " test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
git checkout -f initial^0 && git checkout -f initial^0 &&
git read-tree -u --reset HEAD && git read-tree -u --reset HEAD &&
git clean -d -f -f -q -x && git clean -d -f -f -q -x &&