]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/filter-options-should-use-plain-int'
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:09 +0000 (14:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:10 +0000 (14:26 -0800)
Update the protocol message specification to allow only the limited
use of scaled quantities.  This is ensure potential compatibility
issues will not go out of hand.

* js/filter-options-should-use-plain-int:
  filter-options: expand scaled numbers
  tree:<depth>: skip some trees even when collecting omits
  list-objects-filter: teach tree:# how to handle >0

1  2 
Documentation/rev-list-options.txt
builtin/clone.c
builtin/fetch.c
fetch-pack.c
transport-helper.c
upload-pack.c

Simple merge
diff --cc builtin/clone.c
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc fetch-pack.c
Simple merge
Simple merge
diff --cc upload-pack.c
Simple merge