Skip to content
Permalink
Browse files

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 <johannes.schindelin@gmx.de>
  • Loading branch information...
dscho committed Oct 12, 2017
2 parents 34c1a97 + 88c3cbc commit 924c19fc000d3759486b68bd73bc592fa02e367c
Showing with 5 additions and 3 deletions.
  1. +5 −3 ref-filter.c
@@ -1268,9 +1268,11 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
else
*s = "";
} else if (atom->u.remote_ref.option == RR_REMOTE_REF) {
int explicit, for_push = starts_with(atom->name, "push");
const char *merge = remote_ref_for_branch(branch, for_push,
&explicit);
int explicit;
const char *merge;

merge = remote_ref_for_branch(branch, atom->u.remote_ref.push,
&explicit);
if (explicit)
*s = xstrdup(merge);
else

0 comments on commit 924c19f

Please sign in to comment.
You can’t perform that action at this time.