branch: update warning message shown when copying a misnamed branch

When a user tries to rename a branch that has a "bad name" (e.g.,
starts with a '-') then we warn them that the misnamed branch has
been renamed "away". A similar message is shown when trying to create
a copy of a misnamed branch even though it doesn't remove the misnamed
branch. This is not correct and may confuse the user.

So, update the warning message shown to be more precise that only a copy
of the misnamed branch has been created. It's better to show the warning
message than not showing it at all as it makes the user aware of the
presence of a misnamed branch.

Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/branch.c b/builtin/branch.c
index 4edef5baa748f276d9de677d4b88935d5084f8e5..ca9d8abd0959507b05396239517b9f7dd088a1da 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -507,7 +507,7 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
 
        if (recovery) {
                if (copy)
 
        if (recovery) {
                if (copy)

-                       warning(_("Copied a misnamed branch '%s' away"),
+                       warning(_("Created a copy of a misnamed branch '%s'"),

                                oldref.buf + 11);
                else
                        warning(_("Renamed a misnamed branch '%s' away"),
                                oldref.buf + 11);
                else
                        warning(_("Renamed a misnamed branch '%s' away"),