diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2020-01-31 09:12:08 +0900 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-01 01:09:46 +0100 |
| commit | f57a7bd2306d81ce244621c45a0e569096d8e797 (patch) | |
| tree | 0799a949f5f9a2be5aaf30404b58bd2979490fdf /org.eclipse.jgit/.settings | |
| parent | 0d962eaa78223c09c9bd38bc50440bf82ff03f70 (diff) | |
| parent | 7d5300023e867ae1e259bc5ec3839dff2bc3fab8 (diff) | |
| download | jgit-f57a7bd2306d81ce244621c45a0e569096d8e797.tar.gz jgit-f57a7bd2306d81ce244621c45a0e569096d8e797.zip | |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
Fix string format parameter for invalidRefAdvertisementLine
WindowCache: add metric for cached bytes per repository
pgm daemon: fallback to user and system config if no config specified
WindowCache: add option to use strong refs to reference ByteWindows
Change-Id: I741059a1d0d5950ab5bc16ec70352655ee926a24
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 2a4fc54537..998c7cd79c 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -84,6 +84,12 @@ <filter id="1142947843"> <message_arguments> <message_argument value="5.1.13"/> + <message_argument value="CONFIG_KEY_PACKED_GIT_USE_STRONGREFS"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.1.13"/> <message_argument value="CONFIG_KEY_PACKED_GIT_WINDOWSIZE"/> </message_arguments> </filter> @@ -142,6 +148,20 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/storage/file/WindowCacheConfig.java" type="org.eclipse.jgit.storage.file.WindowCacheConfig"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.1.13"/> + <message_argument value="isPackedGitUseStrongRefs()"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.1.13"/> + <message_argument value="setPackedGitUseStrongRefs(boolean)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/storage/file/WindowCacheStats.java" type="org.eclipse.jgit.storage.file.WindowCacheStats"> <filter id="337809484"> <message_arguments> |