summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2010-08-20 17:41:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-20 18:17:28 (GMT)
commit09a0ec58ce57413dcb2b2cfb4b4ece11ad616e7b (patch)
tree2220928be55641b1a93d8d54fab6ff82712c4660 /builtin/checkout.c
parentc11969de93e741ae42d1d1d60ce716de6cf5e22b (diff)
downloadgit-09a0ec58ce57413dcb2b2cfb4b4ece11ad616e7b.zip
git-09a0ec58ce57413dcb2b2cfb4b4ece11ad616e7b.tar.gz
git-09a0ec58ce57413dcb2b2cfb4b4ece11ad616e7b.tar.bz2
builtin/checkout: Fix message when switching to an existing branch
Fix "Switched to a new branch <name>" to read "Switched to branch <name>" when <name> corresponds to an existing branch. This bug was introduced in 02ac983 while introducing the `-B` switch. Cc: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 1f7e154..7f81120 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -533,10 +533,13 @@ static void update_refs_for_switch(struct checkout_opts *opts,
if (old->path && !strcmp(new->path, old->path))
fprintf(stderr, "Already on '%s'\n",
new->name);
- else
+ else if (opts->new_branch)
fprintf(stderr, "Switched to%s branch '%s'\n",
opts->branch_exists ? " and reset" : " a new",
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];