diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-03-12 21:01:55 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-03-12 22:26:58 +0100 |
| commit | d96eb8b3e6bf7cca71ee166fa669d0a60eaa0d6c (patch) | |
| tree | b98e7b86a6eed198c29bc08e0b814dcaf7a25166 /org.eclipse.jgit/.settings | |
| parent | 2e951b0d3a0f0597857d811bb9b0287d96ba3ba6 (diff) | |
| parent | a47367e5fb1ab4d9d908583237b65491a4bb217d (diff) | |
| download | jgit-d96eb8b3e6bf7cca71ee166fa669d0a60eaa0d6c.tar.gz jgit-d96eb8b3e6bf7cca71ee166fa669d0a60eaa0d6c.zip | |
Merge branch 'stable-4.5' into stable-4.6
* stable-4.5:
Prepare 4.5.7-SNAPSHOT builds
JGit v4.5.6.201903121547-r
Check for packfile validity and fd before reading
Move throw of PackInvalidException outside the catch
Use FileSnapshot to get lastModified on PackFile
Include size when comparing FileSnapshot
Do not reuse packfiles when changed on filesystem
Silence API warnings for new API introduced for fixes
Change-Id: I029e1797447e6729de68bd89d4d69b324dbb3f5f
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 | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index c6af42ee28..c74a500aba 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -65,5 +65,27 @@ <message_argument value="supportsAtomicCreateNewFile()"/> </message_arguments> </filter> + <filter id="924844039"> + <message_arguments> + <message_argument value="4.5.6"/> + <message_argument value="4.5.0"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants"> + <filter id="336658481"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/> + <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="4.5.6"/> + <message_argument value="fileAttributes(File)"/> + </message_arguments> + </filter> </resource> </component> |