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

i18n: apply: mark error message for translation

Browse Source 
Update test to reflect changes.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida 2016-10-17 13:15:26 +00:00 committed by Junio C Hamano
parent d1d42bf598
commit f25dfb5e8d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apply.c
View File

@ -1586,8 +1586,8 @@ static int find_header(struct apply_state *state,
patch->new_name = xstrdup(patch->def_name); patch->new_name = xstrdup(patch->def_name);
} }
if (!patch->is_delete && !patch->new_name) { if (!patch->is_delete && !patch->new_name) {
error("git diff header lacks filename information " error(_("git diff header lacks filename information "
"(line %d)", state->linenr); "(line %d)"), state->linenr);
return -128; return -128;
} }
patch->is_toplevel_relative = 1; patch->is_toplevel_relative = 1;

2
t/t4254-am-corrupt.sh
View File

@ -31,7 +31,7 @@ test_expect_success 'try to apply corrupted patch' '
test_expect_success 'compare diagnostic; ensure file is still here' ' test_expect_success 'compare diagnostic; ensure file is still here' '
echo "error: git diff header lacks filename information (line 4)" >expected && echo "error: git diff header lacks filename information (line 4)" >expected &&
test_path_is_file f && test_path_is_file f &&
test_cmp expected actual test_i18ncmp expected actual
' '
test_done test_done