From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:58:06 +0000 (+0900)
Subject: Merge branch 'tq/branch-style-fix' into maint
X-Git-Tag: v2.19.2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/69ae6660fcf8004f041ff94386bda09109d6ccea?ds=inline;hp=-c

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

Code clean-up.

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

69ae6660fcf8004f041ff94386bda09109d6ccea
diff --combined builtin/branch.c
index daf054598b,1f3c7e3867..ca9ed0abe3
--- a/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"));