Merge branch 'an/branch-config-message'

* an/branch-config-message:
  branch.c: install_branch_config: simplify if chain

branch.c

@@ -77,29 +77,29 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
 	strbuf_release(&key);
 
 	if (flag & BRANCH_CONFIG_VERBOSE) {
-		if (shortname && origin)
+		if (shortname) {
-			printf_ln(rebasing ?
+			if (origin)
-				  _("Branch %s set up to track remote branch %s from %s by rebasing.") :
+				printf_ln(rebasing ?
-				  _("Branch %s set up to track remote branch %s from %s."),
+					  _("Branch %s set up to track remote branch %s from %s by rebasing.") :
-				  local, shortname, origin);
+					  _("Branch %s set up to track remote branch %s from %s."),
-		else if (shortname && !origin)
+					  local, shortname, origin);
-			printf_ln(rebasing ?
+			else
-				  _("Branch %s set up to track local branch %s by rebasing.") :
+				printf_ln(rebasing ?
-				  _("Branch %s set up to track local branch %s."),
+					  _("Branch %s set up to track local branch %s by rebasing.") :
-				  local, shortname);
+					  _("Branch %s set up to track local branch %s."),
-		else if (!shortname && origin)
+					  local, shortname);
-			printf_ln(rebasing ?
+		} else {
-				  _("Branch %s set up to track remote ref %s by rebasing.") :
+			if (origin)
-				  _("Branch %s set up to track remote ref %s."),
+				printf_ln(rebasing ?
-				  local, remote);
+					  _("Branch %s set up to track remote ref %s by rebasing.") :
-		else if (!shortname && !origin)
+					  _("Branch %s set up to track remote ref %s."),
-			printf_ln(rebasing ?
+					  local, remote);
-				  _("Branch %s set up to track local ref %s by rebasing.") :
+			else
-				  _("Branch %s set up to track local ref %s."),
+				printf_ln(rebasing ?
-				  local, remote);
+					  _("Branch %s set up to track local ref %s by rebasing.") :
-		else
+					  _("Branch %s set up to track local ref %s."),
-			die("BUG: impossible combination of %p and %p",
+					  local, remote);
-			    shortname, origin);
+		}
 	}
 }