i18n: git-checkout "HEAD is now at" message
Gettextize the "HEAD is now at" messages. Several tests in t7201-co.sh explicitly checked for this message. Change them to skip under GETTEXT_POISON=YesPlease. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:41 UTC
9398cc4bd44a08a0f6a69b01b2051b94bd2f994d
2 files changed
+6
-6
builtin/checkout.c
+1
-1
@@ -571,7 +571,7 @@ static void update_refs_for_switch(struct checkout_opts *opts,
571
if (!opts->quiet) {
572
if (old->path && advice_detached_head)
573
detach_advice(old->path, new->name);
574
- describe_detached_head("HEAD is now at", new->commit);
574
+ describe_detached_head(_("HEAD is now at"), new->commit);
575
}
576
}
577
remove_branch_state();
t/t7201-co.sh
+5
-5
@@ -223,7 +223,7 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
223
test_cmp two expect
224
'
225
226
-test_expect_success 'checkout to detach HEAD (with advice declined)' '
226
+test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD (with advice declined)' '
227
228
git config advice.detachedHead false &&
229
git checkout -f renamer && git clean -f &&
@@ -242,7 +242,7 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' '
242
fi
243
'
244
245
-test_expect_success 'checkout to detach HEAD' '
245
+test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD' '
246
git config advice.detachedHead true &&
247
git checkout -f renamer && git clean -f &&
248
git checkout renamer^ 2>messages &&
@@ -260,7 +260,7 @@ test_expect_success 'checkout to detach HEAD' '
260
fi
261
'
262
263
-test_expect_success 'checkout to detach HEAD with branchname^' '
263
+test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with branchname^' '
264
265
git checkout -f master && git clean -f &&
266
git checkout renamer^ &&
@@ -276,7 +276,7 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
276
fi
277
'
278
279
-test_expect_success 'checkout to detach HEAD with :/message' '
279
+test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with :/message' '
280
281
git checkout -f master && git clean -f &&
282
git checkout ":/Initial" &&
@@ -292,7 +292,7 @@ test_expect_success 'checkout to detach HEAD with :/message' '
292
fi
293
'
294
295
-test_expect_success 'checkout to detach HEAD with HEAD^0' '
295
+test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with HEAD^0' '
296
297
git checkout -f master && git clean -f &&
298
git checkout HEAD^0 &&