Skip to content

Commit

Permalink
i18n: git-submodule "[...] path is ignored" message
Browse files Browse the repository at this point in the history
Gettextize the "The following path is ignored" message. This is
explicitly tested for so we need to skip a portion of a test with
test_i18ncmp.

Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
avar authored and gitster committed May 21, 2011
1 parent 490b6d5 commit 3a4c3ed
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions git-submodule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,12 @@ cmd_add()

if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
then
echo >&2 "The following path is ignored by one of your .gitignore files:" &&
echo >&2 $path &&
echo >&2 "Use -f if you really want to add it."
(
eval_gettext "The following path is ignored by one of your .gitignore files:
\$path
Use -f if you really want to add it." &&
echo
) >&2
exit 1
fi

Expand Down
2 changes: 1 addition & 1 deletion t/t7400-submodule-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
git add --force .gitignore &&
git commit -m"Ignore everything" &&
! git submodule add "$submodurl" submod >actual 2>&1 &&
test_cmp expect actual
test_i18ncmp expect actual
)
'

Expand Down

0 comments on commit 3a4c3ed

Please sign in to comment.