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

i18n: mark init-db messages for translation

Browse Source 
Mark the init-db messages that were added in v1.7.5-rc1~16^2 (init,
clone: support --separate-git-dir for .git file) by Nguyễn Thái Ngọc
Duy for translation.

This requires splitting up the tests that the patch added so that
certain parts of them can be skipped unless the C_LOCALE_OUTPUT
prerequisite is satisfied.

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-04-10 19:34:02 +00:00 committed by Junio C Hamano
parent f06f08b78c
commit 2c050e017a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/init-db.c
View File

@ -319,10 +319,10 @@ int set_git_dir_init(const char *git_dir, const char *real_git_dir,
struct stat st;
if (!exist_ok && !stat(git_dir, &st))
die("%s already exists", git_dir);
die(_("%s already exists"), git_dir);
if (!exist_ok && !stat(real_git_dir, &st))
die("%s already exists", real_git_dir);
die(_("%s already exists"), real_git_dir);
/*
* make sure symlinks are resolved because we'll be
@ -351,15 +351,15 @@ static void separate_git_dir(const char *git_dir)
else if (S_ISDIR(st.st_mode))
src = git_link;
else
die("unable to handle file type %d", st.st_mode);
die(_("unable to handle file type %d"), st.st_mode);
if (rename(src, git_dir))
die_errno("unable to move %s to %s", src, git_dir);
die_errno(_("unable to move %s to %s"), src, git_dir);
}
fp = fopen(git_link, "w");
if (!fp)
die("Could not create git link %s", git_link);
die(_("Could not create git link %s"), git_link);
fprintf(fp, "gitdir: %s\n", git_dir);
fclose(fp);
}

7
t/t5601-clone.sh
View File

@ -194,11 +194,14 @@ test_expect_success 'do not respect url-encoding of non-url path' '
test_expect_success 'clone separate gitdir' '
rm -rf dst &&
git clone --separate-git-dir realgitdir src dst &&
echo "gitdir: `pwd`/realgitdir" >expected &&
test_cmp expected dst/.git &&
test -d realgitdir/refs
'
test_expect_success C_LOCALE_OUTPUT 'clone separate gitdir: output' '
echo "gitdir: `pwd`/realgitdir" >expected &&
test_cmp expected dst/.git
'
test_expect_success 'clone separate gitdir where target already exists' '
rm -rf dst &&
test_must_fail git clone --separate-git-dir realgitdir src dst