mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dr/push-remote-ref-update'

Browse Source 
Code clean-up.

* dr/push-remote-ref-update:
  remote: drop "explicit" parameter from remote_ref_for_branch()
This commit is contained in:
Junio C Hamano
2020-03-11 10:58:16 -07:00
parent cdef998b46 af8ccd8ade
commit 5fa9169ced
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ref-filter.c
View File

@ -1459,12 +1459,10 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
remote_for_branch(branch, &explicit);
*s = xstrdup(explicit ? remote : "");
} else if (atom->u.remote_ref.option == RR_REMOTE_REF) {
int explicit;
const char *merge;
merge = remote_ref_for_branch(branch, atom->u.remote_ref.push,
&explicit);
*s = xstrdup(explicit ? merge : "");
merge = remote_ref_for_branch(branch, atom->u.remote_ref.push);
*s = xstrdup(merge ? merge : "");
} else
BUG("unhandled RR_* enum");
}