summaryrefslogtreecommitdiff
path: root/builtin/ls-files.c
diff options
context:
space:
mode:
authorAndrew Wheeler <awheeler@motorola.com>2016-01-29 23:18:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-01 23:03:50 (GMT)
commitb2e93f88cb94f487650beb93ff87ceb7ab68a0ed (patch)
tree4602563089727f783559735a5c0a47d838b8f42e /builtin/ls-files.c
parent1b0b6dd0720572dcf90c264aeb91f96a017b0f25 (diff)
downloadgit-b2e93f88cb94f487650beb93ff87ceb7ab68a0ed.zip
git-b2e93f88cb94f487650beb93ff87ceb7ab68a0ed.tar.gz
git-b2e93f88cb94f487650beb93ff87ceb7ab68a0ed.tar.bz2
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 'builtin/ls-files.c')
0 files changed, 0 insertions, 0 deletions