global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-23 00:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mingw/fixup-ref-filter-remote-name'

Browse Source 
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>
This commit is contained in:
Johannes Schindelin
2017-10-12 21:58:03 +02:00
parent 34c1a976dc 88c3cbc105
commit 924c19fc00
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ref-filter.c
View File

@@ -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