Re: [PATCH] builtin/checkout: Fix message when switching to an existing branch
From: Tay Ray Chuan <hidden>
Date: 2016-06-15 22:49:21
On Sat, Aug 21, 2010 at 1:41 AM, Ramkumar Ramachandra [off-list ref] wrote:
quoted hunk ↗ jump to hunk
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);
On a closer reading, I realise that "reset" isn't mentioned if the branch exists. The terser ternary version doesn't suffer from this defect. -- Cheers, Ray Chuan