]> git.ipfire.org Git - thirdparty/git.git/commit - remote.c
push: fix ref status reporting for --force-with-lease
authorAndrew Wheeler <awheeler@motorola.com>
Fri, 29 Jan 2016 23:18:42 +0000 (17:18 -0600)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Feb 2016 23:03:50 +0000 (15:03 -0800)
commitb2e93f88cb94f487650beb93ff87ceb7ab68a0ed
tree4602563089727f783559735a5c0a47d838b8f42e
parent1b0b6dd0720572dcf90c264aeb91f96a017b0f25
push: fix ref status reporting for --force-with-lease

The --force--with-lease push option leads to less
detailed status information than --force. In particular,
the output indicates that a reference was fast-forwarded,
even when it was force-updated.

Modify the --force-with-lease ref status logic to leverage
the --force ref status logic when the "lease" conditions
are met.

Also, enhance tests to validate output status reporting.

Signed-off-by: Andrew Wheeler <awheeler@motorola.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
remote.c
t/t5533-push-cas.sh