motiejus
/
jgit
1
Fork 0
Code Releases Activity
jgit/org.eclipse.jgit/.settings/.api_filters

28 lines
1.1 KiB
Plaintext
Raw Normal View History

Honor CRLF settings when writing merge results Merges are performed using the raw text as stored in the git repository. When we write the merge result, we must apply the correct CRLF settings. Otherwise the line endings in the result will be wrong. Bug: 499615 Change-Id: I37a9b987e9404c97645d2720cd1c7c04c076a96b Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-02-01 22:58:23 +02:00
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit" version="2">
Add missing @since tag and silence API error These methods were introduced for 4.11.1 so we have to silence the API error adding API in a service release raises. Change-Id: Ic847cebbed439912d3979ec2ec1809f77a28f61e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-03-27 01:35:40 +03:00
<resource path="META-INF/MANIFEST.MF">
Silence API warning for new ObjectIdSerializer introduced in 4.11.1 Change-Id: Ic271dae300f7554b7e13bb1f44006e5b38c00011 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-24 19:33:50 +03:00
<filter id="924844039">
Declare ConfigConstants and GitProtocolConstants final This avoids that we have to suppress API errors whenever we add a new constant in a minor release. This change affects implementors only which is ok to do in a minor release following OSGi semantic versioning rules. Change-Id: Iece841886fbe00f1ba567c5ff68093c542ba265e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-15 01:31:37 +03:00
<message_arguments>
Update API warning filter to 5.1.3 We added API in 4.7.5 to fix CVE-2018-17456 Change-Id: I14698fb088de91b8ba8856e461f64138025a89fa Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-10-07 10:46:05 +03:00
<message_argument value="5.1.3"/>
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>
2018-09-08 12:17:38 +03:00
<message_argument value="5.1.0"/>
LFS: support merge/rebase/cherry-pick/diff/compare with LFS files Respect merge=lfs and diff=lfs attributes where required to replace (in memory) the content of LFS pointers with the actual blob content from the LFS storage (and vice versa when staging/merging). Does not implement general support for merge/diff attributes for any other use case apart from LFS. Change-Id: Ibad8875de1e0bee8fe3a1dffb1add93111534cae Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-03-02 11:11:42 +02:00
</message_arguments>
</filter>
Declare ConfigConstants and GitProtocolConstants final This avoids that we have to suppress API errors whenever we add a new constant in a minor release. This change affects implementors only which is ok to do in a minor release following OSGi semantic versioning rules. Change-Id: Iece841886fbe00f1ba567c5ff68093c542ba265e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-15 01:31:37 +03:00
</resource>
ObjectChecker: Report .gitmodules files found in the pack In order to validate .gitmodules files, we first need to find them in the incoming pack. Do it in the ObjectChecker stage. Check in the tree objects if they point to a .gitmodules file and report the tree id and the .gitmodules blob id. This can be used later to check if the file is in the root of the project and if the contents are good. While we're here, make isMacHFSGit more accurate by detecting variants of filenames that vary in case. [jn: tweaked NTFS and HFS+ checking; added more tests] Change-Id: I70802e7d2c1374116149de4f89836b9498f39582 Signed-off-by: Ivan Frade <ifrade@google.com> Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-27 23:05:13 +03:00
<resource path="src/org/eclipse/jgit/lib/GitmoduleEntry.java" type="org.eclipse.jgit.lib.GitmoduleEntry">
<filter id="1109393411">
Declare ConfigConstants and GitProtocolConstants final This avoids that we have to suppress API errors whenever we add a new constant in a minor release. This change affects implementors only which is ok to do in a minor release following OSGi semantic versioning rules. Change-Id: Iece841886fbe00f1ba567c5ff68093c542ba265e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-15 01:31:37 +03:00
<message_arguments>
ObjectChecker: Report .gitmodules files found in the pack In order to validate .gitmodules files, we first need to find them in the incoming pack. Do it in the ObjectChecker stage. Check in the tree objects if they point to a .gitmodules file and report the tree id and the .gitmodules blob id. This can be used later to check if the file is in the root of the project and if the contents are good. While we're here, make isMacHFSGit more accurate by detecting variants of filenames that vary in case. [jn: tweaked NTFS and HFS+ checking; added more tests] Change-Id: I70802e7d2c1374116149de4f89836b9498f39582 Signed-off-by: Ivan Frade <ifrade@google.com> Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-27 23:05:13 +03:00
<message_argument value="4.7.5"/>
<message_argument value="org.eclipse.jgit.lib.GitmoduleEntry"/>
Declare ConfigConstants and GitProtocolConstants final This avoids that we have to suppress API errors whenever we add a new constant in a minor release. This change affects implementors only which is ok to do in a minor release following OSGi semantic versioning rules. Change-Id: Iece841886fbe00f1ba567c5ff68093c542ba265e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-15 01:31:37 +03:00
</message_arguments>
</filter>
</resource>
ObjectChecker: Report .gitmodules files found in the pack In order to validate .gitmodules files, we first need to find them in the incoming pack. Do it in the ObjectChecker stage. Check in the tree objects if they point to a .gitmodules file and report the tree id and the .gitmodules blob id. This can be used later to check if the file is in the root of the project and if the contents are good. While we're here, make isMacHFSGit more accurate by detecting variants of filenames that vary in case. [jn: tweaked NTFS and HFS+ checking; added more tests] Change-Id: I70802e7d2c1374116149de4f89836b9498f39582 Signed-off-by: Ivan Frade <ifrade@google.com> Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-27 23:05:13 +03:00
<resource path="src/org/eclipse/jgit/lib/ObjectChecker.java" type="org.eclipse.jgit.lib.ObjectChecker">
<filter id="1142947843">
Silence API errors raised for new public fields in PackStatistics Change-Id: I8e118282a833361b676aa3cc90cbe774ccd42ed0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-02-18 23:08:39 +02:00
<message_arguments>
ObjectChecker: Report .gitmodules files found in the pack In order to validate .gitmodules files, we first need to find them in the incoming pack. Do it in the ObjectChecker stage. Check in the tree objects if they point to a .gitmodules file and report the tree id and the .gitmodules blob id. This can be used later to check if the file is in the root of the project and if the contents are good. While we're here, make isMacHFSGit more accurate by detecting variants of filenames that vary in case. [jn: tweaked NTFS and HFS+ checking; added more tests] Change-Id: I70802e7d2c1374116149de4f89836b9498f39582 Signed-off-by: Ivan Frade <ifrade@google.com> Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-27 23:05:13 +03:00
<message_argument value="4.7.5"/>
<message_argument value="getGitsubmodules()"/>
Silence API errors raised for new public fields in PackStatistics Change-Id: I8e118282a833361b676aa3cc90cbe774ccd42ed0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-02-18 23:08:39 +02:00
</message_arguments>
</filter>
</resource>
Honor CRLF settings when writing merge results Merges are performed using the raw text as stored in the git repository. When we write the merge result, we must apply the correct CRLF settings. Otherwise the line endings in the result will be wrong. Bug: 499615 Change-Id: I37a9b987e9404c97645d2720cd1c7c04c076a96b Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-02-01 22:58:23 +02:00
</component>