[PATCH] builtin/checkout: Fix message when switching to an existing branch
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Aug 20, 2010, 17:41 UTC
- Message-ID
- <1282326107-2139-1-git-send-email-artagnon@gmail.com>
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> --- builtin/checkout.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c index 156900d..ff5ac1e 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -545,10 +545,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];
-- 1.7.2.2.408.g7357