diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-10-17 13:15:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 14:51:42 -0700 |
| commit | f25dfb5e8d26204e58d60a6fc209e4ae65827d83 (patch) | |
| tree | 938ac75ee1cdae46103949eedce4a34649896a97 | |
| parent | d1d42bf5980b2d31f43f4a54c3d98d19f879b919 (diff) | |
| download | git-f25dfb5e8d26204e58d60a6fc209e4ae65827d83.tar.gz | |
i18n: apply: mark error message for translation
Update test to reflect changes.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | apply.c | 4 | ||||
| -rwxr-xr-x | t/t4254-am-corrupt.sh | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1586,8 +1586,8 @@ static int find_header(struct apply_state *state, patch->new_name = xstrdup(patch->def_name); } if (!patch->is_delete && !patch->new_name) { - error("git diff header lacks filename information " - "(line %d)", state->linenr); + error(_("git diff header lacks filename information " + "(line %d)"), state->linenr); return -128; } patch->is_toplevel_relative = 1; diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh index 9bd7dd2ba1..168739c721 100755 --- a/t/t4254-am-corrupt.sh +++ b/t/t4254-am-corrupt.sh @@ -31,7 +31,7 @@ test_expect_success 'try to apply corrupted patch' ' test_expect_success 'compare diagnostic; ensure file is still here' ' echo "error: git diff header lacks filename information (line 4)" >expected && test_path_is_file f && - test_cmp expected actual + test_i18ncmp expected actual ' test_done |