Skip to content

Commit 924c19f

Browse files
committed
Merge branch 'mingw/fixup-ref-filter-remote-name'
These fixups/squashes reflect the changes accumulated so far after submitting v2 of the ref-filter-remote-name patch series to the Git mailing list. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 34c1a97 + 88c3cbc commit 924c19f

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

ref-filter.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,9 +1268,11 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
12681268
else
12691269
*s = "";
12701270
} else if (atom->u.remote_ref.option == RR_REMOTE_REF) {
1271-
int explicit, for_push = starts_with(atom->name, "push");
1272-
const char *merge = remote_ref_for_branch(branch, for_push,
1273-
&explicit);
1271+
int explicit;
1272+
const char *merge;
1273+
1274+
merge = remote_ref_for_branch(branch, atom->u.remote_ref.push,
1275+
&explicit);
12741276
if (explicit)
12751277
*s = xstrdup(merge);
12761278
else

0 commit comments

Comments
 (0)