mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-submodule "[...] path is ignored" message

Browse Source 
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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2011-05-21 18:44:07 +00:00
committed by Junio C Hamano
parent 490b6d5749
commit 3a4c3ed7e8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
git-submodule.sh
View File

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

2
t/t7400-submodule-basic.sh
View File

@ -99,7 +99,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
git add --force .gitignore && git add --force .gitignore &&
git commit -m"Ignore everything" && git commit -m"Ignore everything" &&
! git submodule add "$submodurl" submod >actual 2>&1 && ! git submodule add "$submodurl" submod >actual 2>&1 &&
test_cmp expect actual test_i18ncmp expect actual
) )
' '