undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport-helper.c: do not overwrite forced bit

Browse Source 
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>
This commit is contained in:
Max Horn 2014-02-21 10:55:59 +01:00 committed by Junio C Hamano
parent f9e3c6bebb
commit cf31f70c08
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transport-helper.c
View File

@ -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);
}