[PATCH try2 1/2] branch: trivial cleanup
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:58:58
Subsystem:
the rest · Maintainer:
Linus Torvalds
No functional changes. Signed-off-by: Felipe Contreras <redacted> --- builtin/branch.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 0836890..ac17b18 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c@@ -425,16 +425,15 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name, struct strbuf fancy = STRBUF_INIT; if (!stat_tracking_info(branch, &ours, &theirs)) { - if (branch && branch->merge && branch->merge[0]->dst && - show_upstream_ref) { - ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0); - if (want_color(branch_use_color)) - strbuf_addf(stat, "[%s%s%s] ", - branch_get_color(BRANCH_COLOR_UPSTREAM), - ref, branch_get_color(BRANCH_COLOR_RESET)); - else - strbuf_addf(stat, "[%s] ", ref); - } + if (!branch || !branch->merge || !branch->merge[0]->dst || !show_upstream_ref) + return; + ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0); + if (want_color(branch_use_color)) + strbuf_addf(stat, "[%s%s%s] ", + branch_get_color(BRANCH_COLOR_UPSTREAM), + ref, branch_get_color(BRANCH_COLOR_RESET)); + else + strbuf_addf(stat, "[%s] ", ref); return; }
--
1.8.4-fc