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>
Max Horn committed
Feb 21, 2014 at 10:55 UTC
cf31f70c088a314a9d11a4106d2fe1036051890a
1 file changed
+1
-1
transport-helper.c
+1
-1
@@ -727,7 +727,7 @@ static int push_update_ref_status(struct strbuf *buf,
727
}
728
729
(*ref)->status = status;
730
- (*ref)->forced_update = forced;
730
+ (*ref)->forced_update |= forced;
731
(*ref)->remote_status = msg;
732
return !(status == REF_STATUS_OK);
733
}