Ãvar ArnfjÃrà Bjarmason <avarab@xxxxxxxxx> writes:
> fp = fopen(git_link, "w");
> if (!fp)
> - die("Could not create git link %s", git_link);
> - fprintf(fp, "gitdir: %s\n", git_dir);
> + die(_("Could not create git link %s"), git_link);
> + fprintf(fp, _("gitdir: %s\n"), git_dir);
> fclose(fp);
> }
>
> diff --git a/t/t0001-init.sh b/t/t0001-init.sh
> index a5816d0..fa31cbd 100755
> --- a/t/t0001-init.sh
> +++ b/t/t0001-init.sh
> @@ -374,22 +374,28 @@ test_expect_success 'init prefers command line to GIT_DIR' '
> test_expect_success 'init with separate gitdir' '
> rm -rf newdir &&
> git init --separate-git-dir realgitdir newdir &&
> - echo "gitdir: `pwd`/realgitdir" >expected &&
> - test_cmp expected newdir/.git &&
> test -d realgitdir/refs
> '
>
> +test_expect_success C_LOCALE_OUTPUT 'init with separate gitdir: output' '
> + echo "gitdir: `pwd`/realgitdir" >expected &&
> + test_cmp expected newdir/.git
> +'
I don't think this is correct. The file "git_link" refers to .git that is
not a directory but is a regular file whose contents is "gitdir: $path"
and that should _never_ be localized, so the patch to die() message is Ok,
but the string given to fprintf(fp, ...) is _not_.
And t0001 should compare the expected output with "gitdir: $path"
regardless of the poisoning.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html