summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:41:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-10 07:52:54 (GMT)
commit08eaa4be0332e6f9f8732fbb99272b4bbf3ea3de (patch)
tree9076239fba6afb451b354a5d68d858403087b727 /builtin/checkout.c
parent9398cc4bd44a08a0f6a69b01b2051b94bd2f994d (diff)
downloadgit-08eaa4be0332e6f9f8732fbb99272b4bbf3ea3de.zip
git-08eaa4be0332e6f9f8732fbb99272b4bbf3ea3de.tar.gz
git-08eaa4be0332e6f9f8732fbb99272b4bbf3ea3de.tar.bz2
i18n: git-checkout "Switched to a .. branch" message
Split up the "Switched to and reset branch" and "Switched to a new branch" messages to make them easier to translate. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index fb93d63..9f8e41e 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -546,16 +546,18 @@ static void update_refs_for_switch(struct checkout_opts *opts,
if (new->path) {
create_symref("HEAD", new->path, msg.buf);
if (!opts->quiet) {
- if (old->path && !strcmp(new->path, old->path))
+ if (old->path && !strcmp(new->path, old->path)) {
fprintf(stderr, _("Already on '%s'\n"),
new->name);
- else if (opts->new_branch)
- fprintf(stderr, "Switched to%s branch '%s'\n",
- opts->branch_exists ? " and reset" : " a new",
- new->name);
- else
+ } else if (opts->new_branch) {
+ if (opts->branch_exists)
+ fprintf(stderr, _("Switched to and reset branch '%s'\n"), new->name);
+ else
+ fprintf(stderr, _("Switched to a new branch '%s'\n"), new->name);
+ } else {
fprintf(stderr, _("Switched to branch '%s'\n"),
new->name);
+ }
}
if (old->path && old->name) {
char log_file[PATH_MAX], ref_file[PATH_MAX];