diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-11 10:58:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-11 10:58:16 -0700 |
| commit | 5fa9169ced8f874910cf4cf289a650d65f52df22 (patch) | |
| tree | cabde11cf046e13183cdf5d69746a3bb2bea5382 /ref-filter.c | |
| parent | cdef998b4619cb9acfe2955fcbe9db0ea2f46d33 (diff) | |
| parent | af8ccd8ade1e2dd1bf332067b98dd4459e29c1d3 (diff) | |
| download | git-5fa9169ced8f874910cf4cf289a650d65f52df22.tar.gz | |
Merge branch 'dr/push-remote-ref-update'
Code clean-up.
* dr/push-remote-ref-update:
remote: drop "explicit" parameter from remote_ref_for_branch()
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ref-filter.c b/ref-filter.c index 79bb520678..b1812cb69a 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -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"); } |