Improve error message for branching an existing branch

PATCH In review John Tapsell 1 participant 1 message Jun 15, 2016

lore

Share & tools

lore

John Tapsell

author

2016-06-15 22:46 UTC #0 lore raw

PATCH 3/6 Improve error message for branching an existing branch

Signed-off-by John Tapsell <[email protected]>

---
 branch.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

branch.c +2 -1

index 1f00e44..86ac293 100644
@@ -120,7 +120,8 @@ void create_branch(const char *head,
 
 	if (resolve_ref(ref.buf, sha1, 1, NULL)) {
 		if (!force)
-			die("A branch named '%s' already exists.", name);
+			die("A branch named '%s' already exists.\n"
+			    "Maybe you wanted to change to this branch with: git checkout '%s'", name, name);
 		else if (!is_bare_repository() && !strcmp(head, name))
 			die("Cannot force update the current branch.");
 		forcing = 1;

Signature · 1 line

1.6.2.rc1.3.g7d31b.dirty