diff options
| -rwxr-xr-x | git-submodule.sh | 9 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index f7d7f51c37..11c4bade1a 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -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 diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 874279e32d..ea3b445b43 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -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 ) ' |