diff options
| author | Max Horn <max@quendi.de> | 2014-02-21 10:55:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-24 09:04:17 -0800 |
| commit | cf31f70c088a314a9d11a4106d2fe1036051890a (patch) | |
| tree | b1b40dd60cba150171ab4b6b45b0904f4d10a62a | |
| parent | f9e3c6bebb89de12f2dfdaa1899cb22e9ef32542 (diff) | |
| download | git-cf31f70c088a314a9d11a4106d2fe1036051890a.tar.gz | |
transport-helper.c: do not overwrite forced bit
If the the transport helper says it was a forced update, then it is
a forced update. It is however possible that an update is forced
without the transport-helper knowing about it, namely because some
higher up code had objections to the update and needed forcing in
order to let it through to the transport helper. In other words, it
does not necessarily mean the update was *not* forced, when the
helper did not say "forced update".
Signed-off-by: Max Horn <max@quendi.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | transport-helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport-helper.c b/transport-helper.c index abe4c3c2c2..705dce7e04 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -727,7 +727,7 @@ static int push_update_ref_status(struct strbuf *buf, } (*ref)->status = status; - (*ref)->forced_update = forced; + (*ref)->forced_update |= forced; (*ref)->remote_status = msg; return !(status == REF_STATUS_OK); } |