summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorLibravatar Andrew Wheeler <awheeler@motorola.com>2016-01-29 17:18:42 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-01 15:03:50 -0800
commitb2e93f88cb94f487650beb93ff87ceb7ab68a0ed (patch)
tree4602563089727f783559735a5c0a47d838b8f42e /read-cache.c
parentMerge branch 'maint' of git://github.com/git-l10n/git-po into maint (diff)
downloadtgif-b2e93f88cb94f487650beb93ff87ceb7ab68a0ed.tar.xz
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>
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions