@@ -2239,34 +2239,30 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
 static char *resolve_compare_branch(struct branch *branch, const char *name)
 {
 	struct strbuf buf = STRBUF_INIT;
-	const char *resolved = NULL;
+	struct object_id oid;
 	char *ret;
 
 	if (!branch || !name)
 		return NULL;
 
-	if (!strcasecmp(name, "@{upstream}") || !strcasecmp(name, "@{u}"))
-		resolved = branch_get_upstream(branch, NULL);
-	else if (!strcasecmp(name, "@{push}"))
-		resolved = branch_get_push(branch, NULL);
-
-	if (resolved)
-		return xstrdup(resolved);
-
-	strbuf_addf(&buf, "refs/remotes/%s", name);
-	resolved = refs_resolve_ref_unsafe(
-		get_main_ref_store(the_repository),
-		buf.buf,
-		RESOLVE_REF_READING,
-		NULL, NULL);
-	if (resolved) {
-		ret = xstrdup(resolved);
-		strbuf_release(&buf);
-		return ret;
+	while (strbuf_expand_step(&buf, &name)) {
+		if (skip_prefix(name, "%", &name))
+			strbuf_addch(&buf, '%');
+		else if (skip_prefix(name, "s", &name))
+			strbuf_addstr(&buf, branch->name);
+		else
+			die("bad compareBranches format: %%%s", name);
 	}
 
+	/*
+	 * This will leave "ret" as NULL if we don't find anything. If there
+	 * are multiple ambiguous matches it will pick the first. Should we
+	 * return an error instead?
+	 */
+	repo_dwim_ref(the_repository, buf.buf, buf.len, &oid, &ret, 1);
+
 	strbuf_release(&buf);
-	return NULL;
+	return ret;
 }
 
 static void format_branch_comparison(struct strbuf *sb,

@@ -2352,7 +2348,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
 		string_list_split(&branches, compare_branches, " ", -1);
 		string_list_remove_empty_items(&branches, 0);
 	} else {
-		string_list_append(&branches, "@{upstream}");
+		string_list_append(&branches, "%s@{upstream}");
 	}
 
 	upstream_ref = branch_get_upstream(branch, NULL);

@@ -178,6 +178,12 @@ static int install_branch_config_multiple_remotes(int flag, const char *local,
 		string_list_clear(&friendly_ref_names, 0);
 	}
 
+	/*
+	 * We installed new config; flush any internal cache of the on-disk
+	 * config.
+	 */
+	remote_state_clear(the_repository->remote_state);
+
 	return 0;
 
 out_err:

@@ -2859,6 +2859,14 @@ void remote_state_clear(struct remote_state *remote_state)
 		free(b);
 	}
 	hashmap_clear(&remote_state->branches_hash);
+
+	/*
+	 * Eek, we just cleared everything out; we should mark ourselves as
+	 * uninitialized so we can be used again. Nobody seems to have noticed
+	 * because we only remote_state_clear() when we are about to discard
+	 * the struct entirely.
+	 */
+	remote_state->initialized = 0;
 }
 
 /*