[PATCH] checkout: warn about 'branch name' rather than 'local branch'
From: Sverre Rabbelier <hidden>
Date: 2016-06-15 22:48:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] checkout: warn about 'branch name' rather than 'local branch' · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] checkout: warn about 'branch name' rather than 'local branch' · Sverre Rabbelier <hidden>
These days, you can say "git checkout topic" to automagically create a local "topic" branch that forks from "origin/topic" remote tracking branch when you have one, thanks to Dscho's UI improvement ideas. As such it is more appropriate to say that the user is checking out something that is not a branch name, rather than saying it is not a 'local branch'. Signed-off-by: Sverre Rabbelier <redacted> --- Junio, I used part of your reply as the commit message, is that ok? Only change is s/local branch/branch name/. builtin-checkout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 5277817..4b34314 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c@@ -523,7 +523,7 @@ static void update_refs_for_switch(struct checkout_opts *opts, REF_NODEREF, DIE_ON_ERR); if (!opts->quiet) { if (old->path) - fprintf(stderr, "Note: moving to '%s' which isn't a local branch\nIf you want to create a new branch from this checkout, you may do so\n(now or later) by using -b with the checkout command again. Example:\n git checkout -b <new_branch_name>\n", new->name); + fprintf(stderr, "Note: moving to '%s' which isn't a branch name\nIf you want to create a new branch from this checkout, you may do so\n(now or later) by using -b with the checkout command again. Example:\n git checkout -b <new_branch_name>\n", new->name); describe_detached_head("HEAD is now at", new->commit); } }
--
1.6.6.rc1.56.gaea25.dirty