diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-08 07:19:13 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-08 08:58:12 +0200 |
| commit | 8699a95d2d1ed0d3ad7b3022a408e3b9e8e66535 (patch) | |
| tree | db9869ed686c719ac8b004708b42c9442e136828 /org.eclipse.jgit/.settings | |
| parent | b270e4b740a3b974bd5029fae224edc8ec088025 (diff) | |
| parent | 06e06fc291a8ccc0e68b7d84b54097a9635df740 (diff) | |
| download | jgit-8699a95d2d1ed0d3ad7b3022a408e3b9e8e66535.tar.gz jgit-8699a95d2d1ed0d3ad7b3022a408e3b9e8e66535.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
Fix atomic lock file creation on NFS
Use constant for ".lock"
Fix handling of option core.supportsAtomicCreateNewFile
GC: Avoid logging errors when deleting non-empty folders
Change-Id: Ia7a18f69eee173aec9e462c16eee2b0ca4565e76
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 | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 8a24587e27..2d34f5717a 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -38,5 +38,21 @@ <message_argument value="supportsAtomicCreateNewFile()"/> </message_arguments> </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.7"/> + <message_argument value="4.8"/> + <message_argument value="createNewFileAtomic(File)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$LockToken"> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.7"/> + <message_argument value="4.8"/> + <message_argument value="LockToken"/> + </message_arguments> + </filter> </resource> </component> |