Merge branch 'tq/branch-style-fix' into maint

Code clean-up.

* tq/branch-style-fix:
branch: trivial style fix

diff --combined builtin/branch.c
index daf054598ba0b8ba7c515326891a0c47b90a38d5,1f3c7e386767a1a0a461ad123566377c4c568d59..ca9ed0abe3fc176368a321760ecde8db55760d2f
--- 1/builtin/branch.c
--- 2/builtin/branch.c
+++ b/builtin/branch.c
@@@ -735,8 -735,7 +735,7 @@@ int cmd_branch(int argc, const char **a
                print_columns(&output, colopts, NULL);
                string_list_clear(&output, 0);
                return 0;
-       }
-       else if (edit_description) {
+       } else if (edit_description) {
                const char *branch_name;
                struct strbuf branch_ref = STRBUF_INIT;
  
@@@ -828,6 -827,11 +827,6 @@@
                git_config_set_multivar(buf.buf, NULL, NULL, 1);
                strbuf_release(&buf);
        } else if (argc > 0 && argc <= 2) {
 -              struct branch *branch = branch_get(argv[0]);
 -
 -              if (!branch)
 -                      die(_("no such branch '%s'"), argv[0]);
 -
                if (filter.kind != FILTER_REFS_BRANCHES)
                        die(_("-a and -r options to 'git branch' do not make sense with a branch name"));