Skip to content

Commit

Permalink
transport-helper.c: do not overwrite forced bit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Max Horn authored and Junio C Hamano committed Feb 24, 2014
1 parent f9e3c6b commit cf31f70
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion transport-helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit cf31f70

Please sign in to comment.