Merge branch 'nd/edit-branch-desc-while-detached' into HEAD

* nd/edit-branch-desc-while-detached:
branch: no detached HEAD check when editing another branch's description

diff --git a/builtin/branch.c b/builtin/branch.c
index 531a21e831f84bf9484548507e8428d662ecaa91..ca61c5ba59e7286ebabea865f574976e240b5d2c 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -852,11 +852,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                const char *branch_name;
                struct strbuf branch_ref = STRBUF_INIT;
 
-               if (detached)
-                       die("Cannot give description to detached HEAD");
-               if (!argc)
+               if (!argc) {
+                       if (detached)
+                               die("Cannot give description to detached HEAD");
                        branch_name = head;
-               else if (argc == 1)
+               } else if (argc == 1)
                        branch_name = argv[0];
                else
                        die(_("cannot edit description of more than one branch"));