diff options
| -rw-r--r-- | builtin/revert.c | 5 | ||||
| -rwxr-xr-x | t/t3507-cherry-pick-conflict.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index b0a5ffb18..98dfd4d13 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -536,8 +536,9 @@ static int do_pick_commit(void) } if (res) { - error("could not %s %s... %s", - action == REVERT ? "revert" : "apply", + error(action == REVERT + ? _("could not revert %s... %s") + : _("could not apply %s... %s"), find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), msg.subject); print_advice(); diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 607bf25d8..f7e407231 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -38,7 +38,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' ' 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 read-tree -u --reset HEAD && git clean -d -f -f -q -x && |