i18n: mark init-db messages for translation
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>
Ævar Arnfjörð Bjarmason committed
Apr 10, 2011 at 19:34 UTC
2c050e017a5e7727a7448620d872d46ba22675e9
2 files changed
+10
-7
builtin/init-db.c
+5
-5
@@ -319,10 +319,10 @@ int set_git_dir_init(const char *git_dir, const char *real_git_dir,
319
struct stat st;
320
321
if (!exist_ok && !stat(git_dir, &st))
322
- die("%s already exists", git_dir);
322
+ die(_("%s already exists"), git_dir);
323
324
if (!exist_ok && !stat(real_git_dir, &st))
325
- die("%s already exists", real_git_dir);
325
+ die(_("%s already exists"), real_git_dir);
326
327
/*
328
* make sure symlinks are resolved because we'll be
@@ -351,15 +351,15 @@ static void separate_git_dir(const char *git_dir)
351
else if (S_ISDIR(st.st_mode))
352
src = git_link;
353
else
354
- die("unable to handle file type %d", st.st_mode);
354
+ die(_("unable to handle file type %d"), st.st_mode);
355
356
if (rename(src, git_dir))
357
- die_errno("unable to move %s to %s", src, git_dir);
357
+ die_errno(_("unable to move %s to %s"), src, git_dir);
358
}
359
360
fp = fopen(git_link, "w");
361
if (!fp)
362
- die("Could not create git link %s", git_link);
362
+ die(_("Could not create git link %s"), git_link);
363
fprintf(fp, "gitdir: %s\n", git_dir);
364
fclose(fp);
365
}
t/t5601-clone.sh
+5
-2
@@ -194,11 +194,14 @@ test_expect_success 'do not respect url-encoding of non-url path' '
194
test_expect_success 'clone separate gitdir' '
195
rm -rf dst &&
196
git clone --separate-git-dir realgitdir src dst &&
197
- echo "gitdir: `pwd`/realgitdir" >expected &&
198
- test_cmp expected dst/.git &&
197
test -d realgitdir/refs
198
'
199
200
+test_expect_success C_LOCALE_OUTPUT 'clone separate gitdir: output' '
201
+ echo "gitdir: `pwd`/realgitdir" >expected &&
202
+ test_cmp expected dst/.git
203
+'
204
+
205
test_expect_success 'clone separate gitdir where target already exists' '
206
rm -rf dst &&
207
test_must_fail git clone --separate-git-dir realgitdir src dst