diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-08 11:17:38 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-08 22:13:00 +0200 |
| commit | 582d623964115ea322cb4bedca610fbc29a4f055 (patch) | |
| tree | fe70ef2a8c16bcd7717ef60bdeffabdbc7fd9263 /org.eclipse.jgit/.settings | |
| parent | 4c8a4eb8fd6ad50c73c2f858ae300cdde312cfc7 (diff) | |
| parent | 155dd1c5be9248e9271f708b970e6868d0461558 (diff) | |
| download | jgit-582d623964115ea322cb4bedca610fbc29a4f055.tar.gz jgit-582d623964115ea322cb4bedca610fbc29a4f055.zip | |
Merge branch 'stable-5.0' into stable-5.1
* stable-5.0:
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: I3c8892e33516bdcadd983e7ab668635b7fa3d4c5
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 | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 9f4b761495..08fa8b3b59 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,17 +1,29 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> - <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants"> - <filter id="337768515"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="924844039"> <message_arguments> - <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/> + <message_argument value="5.1.0"/> + <message_argument value="5.1.0"/> </message_arguments> </filter> </resource> - <resource path="src/org/eclipse/jgit/transport/GitProtocolConstants.java" type="org.eclipse.jgit.transport.GitProtocolConstants"> - <filter id="337768515"> + <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS"> + <filter id="1141899266"> <message_arguments> - <message_argument value="org.eclipse.jgit.transport.GitProtocolConstants"/> + <message_argument value="4.7"/> + <message_argument value="5.1"/> + <message_argument value="createNewFileAtomic(File)"/> </message_arguments> </filter> </resource> -</component>
\ No newline at end of file + <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="5.1"/> + <message_argument value="LockToken"/> + </message_arguments> + </filter> + </resource> +</component> |