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

i18n: notes-merge: mark die messages 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-09-19 13:08:20 +00:00 committed by Junio C Hamano
parent 166e55e328
commit c041c6d06a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
notes-merge.c
View File

@ -269,15 +269,15 @@ static void check_notes_merge_worktree(struct notes_merge_options *o)
if (file_exists(git_path(NOTES_MERGE_WORKTREE)) && if (file_exists(git_path(NOTES_MERGE_WORKTREE)) &&
!is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) { !is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) {
if (advice_resolve_conflict) if (advice_resolve_conflict)
die("You have not concluded your previous " die(_("You have not concluded your previous "
"notes merge (%s exists).\nPlease, use " "notes merge (%s exists).\nPlease, use "
"'git notes merge --commit' or 'git notes " "'git notes merge --commit' or 'git notes "
"merge --abort' to commit/abort the " "merge --abort' to commit/abort the "
"previous merge before you start a new " "previous merge before you start a new "
"notes merge.", git_path("NOTES_MERGE_*")); "notes merge."), git_path("NOTES_MERGE_*"));
else else
die("You have not concluded your notes merge " die(_("You have not concluded your notes merge "
"(%s exists).", git_path("NOTES_MERGE_*")); "(%s exists)."), git_path("NOTES_MERGE_*"));
} }
if (safe_create_leading_directories_const(git_path( if (safe_create_leading_directories_const(git_path(

2
t/t3310-notes-merge-manual-resolve.sh
View File

@ -225,7 +225,7 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish
test -d .git/NOTES_MERGE_WORKTREE && test -d .git/NOTES_MERGE_WORKTREE &&
test_must_fail git notes merge z >output 2>&1 && test_must_fail git notes merge z >output 2>&1 &&
# Output should indicate what is wrong # Output should indicate what is wrong
grep -q "\\.git/NOTES_MERGE_\\* exists" output test_i18ngrep -q "\\.git/NOTES_MERGE_\\* exists" output
' '
# Setup non-conflicting merge between x and new notes ref w # Setup non-conflicting merge between x and new notes ref w