From: Kaartic Sivaraam <kaarticsivaraam91196@xxxxxxxxx>
When trying to rename an inexistent branch to with a name of a branch
that already exists the rename failed specifying the new branch name
exists rather than specifying that the branch trying to be renamed
doesn't exist.
$ git branch -m tset master
fatal: A branch named 'master' already exists.
It's conventional to report that 'tset' doesn't exist rather than
reporting that 'master' exists, the same way the 'mv' command does.
(hypothetical)
$ git branch -m tset master
fatal: branch 'tset' doesn't exist.
That has the problem that the error about an existing branch is shown
only after the user corrects the error about inexistent branch.
$ git branch -m test master
fatal: A branch named 'master' already exists.
This isn't useful either because the user would have corrected this error in
a single go if he had been told this alongside the first error. So, give
more useful error messages by giving errors about old branch name and new
branch name at the same time. This is possible as the branch name validation
functions now return the reason they were about to die, when requested.
$ git branch -m tset master
fatal: branch 'tset' doesn't exist, and branch 'master' already exists
Note: Thanks to the strbuf API that made it possible to easily construct
the composite error message strings!
Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@xxxxxxxxx>
---
builtin/branch.c | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 42 insertions(+), 7 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 7018e5d75..c2bbf8c3d 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -458,11 +458,42 @@ static void reject_rebase_or_bisect_branch(const char *target)
free_worktrees(worktrees);
}
+static void get_error_msg(struct strbuf* error_msg, const char* oldname, unsigned old_branch_exists,
+ const char* newname, enum branch_validation_result res)
+{
+ const char* connector_string = _(", and ");
+
+ if (!old_branch_exists) {
+ strbuf_addf(error_msg, _("branch '%s' doesn't exist"), oldname);
+ }
+
+ switch (res) {
+ case BRANCH_EXISTS_NO_FORCE:
+ strbuf_addf(error_msg, "%s", (!old_branch_exists) ? connector_string : "");
+ strbuf_addf(error_msg,_("branch '%s' already exists"), newname);
+ break;
+ case CANNOT_FORCE_UPDATE_CURRENT_BRANCH:
+ strbuf_addf(error_msg, "%s", (!old_branch_exists) ? connector_string : "");
+ strbuf_addstr(error_msg, _("cannot force update the current branch"));
+ break;
+ case INVALID_BRANCH_NAME:
+ strbuf_addf(error_msg, "%s", (!old_branch_exists) ? connector_string : "");
+ strbuf_addf(error_msg, _("branch name '%s' is invalid"), newname);
+ break;
+ /* not necessary to handle success cases */
+ case BRANCH_EXISTS:
+ case BRANCH_DOESNT_EXIST:
+ break;
+ }
+}
+
static void copy_or_rename_branch(const char *oldname, const char *newname, int copy, int force)
{
struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
int recovery = 0;
+ struct strbuf error_msg = STRBUF_INIT, empty = STRBUF_INIT;
+ enum branch_validation_result res;
if (!oldname) {
if (copy)
@@ -471,15 +502,13 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
die(_("cannot rename the current branch while not on any."));
}
- if (strbuf_check_branch_ref(&oldref, oldname)) {
+ if (strbuf_check_branch_ref(&oldref, oldname) && ref_exists(oldref.buf))
+ {
/*
* Bad name --- this could be an attempt to rename a
* ref that we used to allow to be created by accident.
*/
- if (ref_exists(oldref.buf))
- recovery = 1;
- else
- die(_("Invalid branch name: '%s'"), oldname);
+ recovery = 1;
}
/*
@@ -487,9 +516,13 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
* cause the worktree to become inconsistent with HEAD, so allow it.
*/
if (!strcmp(oldname, newname))
- validate_branchname(newname, &newref, 0);
+ res = validate_branchname(newname, &newref, 1);
else
- validate_new_branchname(newname, &newref, force, 0);
+ res = validate_new_branchname(newname, &newref, force, 1);
+
+ get_error_msg(&error_msg, oldname, ref_exists(oldref.buf), newname, res);
+ if (strbuf_cmp(&error_msg, &empty))
+ die("%s", error_msg.buf);
reject_rebase_or_bisect_branch(oldref.buf);
@@ -530,6 +563,8 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
die(_("Branch is copied, but update of config-file failed"));
strbuf_release(&oldsection);
strbuf_release(&newsection);
+ strbuf_release(&error_msg);
+ strbuf_release(&empty);
}
static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION")
--
2.15.0.461.gf957c703b.dirty
