summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.lfs.test
Commit message (Collapse)AuthorAgeFilesLines
* JGit v6.10.0.202405290101-rc1v6.10.0.202405290101-rc1Matthias Sohn2024-05-292-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ie3d08213e00fcfe1fc34a39021dd99f27e0abc1f
* JGit v6.10.0.202405282244-rc1v6.10.0.202405282244-rc1Matthias Sohn2024-05-292-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ia525790e0b4c9011b29768d2b9727cb48b21ba84
* Prepare 6.10.0-SNAPSHOT buildsMatthias Sohn2024-05-222-2/+2
| | | | Change-Id: I5b6d5c23d504fac386ae04c42b735152fbbcd7ae
* JGit v6.10.0.202405212237-m3v6.10.0.202405212237-m3Matthias Sohn2024-05-222-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I4efb1066ee4146d0455c39cc07879533b8933e43
* Prepare 6.10.0-SNAPSHOT buildsMatthias Sohn2024-03-052-18/+18
| | | | Change-Id: Ie728ef9a7d3c6430a5da30f6a61afd2176015748
* Prepare 6.9.1-SNAPSHOT buildsMatthias Sohn2024-03-052-18/+18
| | | | Change-Id: I10f901209be2faa34ebb9355c86c2106bac38ba5
* JGit v6.9.0.202403050737-rv6.9.0.202403050737-rMatthias Sohn2024-03-052-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I70494c0c69ac549dea9b4cf7c5b25e94c1b4b250
* JGit v6.9.0.202403050045-rv6.9.0.202403050045-rMatthias Sohn2024-03-052-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I4c7a6542ad4252c5a9499e69f68650d2026bde40
* Prepare 6.9.0-SNAPSHOT buildsMatthias Sohn2024-03-052-2/+2
| | | | Change-Id: Ifadeead735c8772e58dd4e5c7381b44c5221a295
* JGit v6.9.0.202402281855-rc1v6.9.0.202402281855-rc1Matthias Sohn2024-02-282-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I23d489ccdc257a8c25da4b90dc51d4a8951d320c
* Prepare 6.9.0-SNAPSHOT buildsMatthias Sohn2024-02-222-2/+2
| | | | Change-Id: I11f4871bfdf6c6c0de5d5ed577edf16bac8cf681
* JGit v6.9.0.202402211805-m3v6.9.0.202402211805-m3Matthias Sohn2024-02-212-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Id2f3934947d6d1e94feeb9e73ad7282ae089b682
* Renormalize line endings based on .gitattributesMatthias Sohn2023-12-221-2/+2
| | | | | | This fixes line endings of all text files to use LF in the repository. Change-Id: I4df6fd7aaf9db9cdaa953a0d1062981b4612056c
* Prepare 6.9.0-SNAPSHOT buildsMatthias Sohn2023-12-042-18/+18
| | | | Change-Id: Id1d784ec4870cfb53c4b140fe0bb3fad9eef651d
* Prepare 6.8.1-SNAPSHOT buildsMatthias Sohn2023-11-292-18/+18
| | | | Change-Id: I56458c5345dcd9544868c948e90c9827d25c6850
* JGit v6.8.0.202311291450-rv6.8.0.202311291450-rMatthias Sohn2023-11-292-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Iecfe3f628cfdc437ee0d63fe52653ef952c8c494
* Prepare 6.8.0-SNAPSHOT buildsMatthias Sohn2023-11-222-2/+2
| | | | Change-Id: I89178175549541111cddb88da401899960c0ecac
* JGit v6.8.0.202311212206-rc1v6.8.0.202311212206-rc1Matthias Sohn2023-11-212-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I6a40cdef68538fa769f4525eb2ff1ed4a810f11c
* Prepare 6.8.0-SNAPSHOT buildsMatthias Sohn2023-11-152-2/+2
| | | | Change-Id: Id11a260db84aea6743f2e6edec8b8010693aab42
* JGit v6.8.0.202311151710-m2v6.8.0.202311151710-m2Matthias Sohn2023-11-152-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I9d06bb08fc1f9a2a08d4bc5a4459ec7e7e8c1be4
* Prepare 6.8.0-SNAPSHOT buildsMatthias Sohn2023-10-032-2/+2
| | | | Change-Id: Idb86bac4bd152e57f1810c789bdbd26648f0b6ae
* JGit v6.8.0.202310031045-m1v6.8.0.202310031045-m1Matthias Sohn2023-10-032-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ida0108f3661213922b1e4340216d60a640a1b662
* Prepare 6.8.0-SNAPSHOT buildsMatthias Sohn2023-09-072-18/+18
| | | | Change-Id: Ifc81f0a96c2ced0b25926b9daa539d9cfc951925
* Prepare 6.7.1-SNAPSHOT buildsMatthias Sohn2023-09-072-18/+18
| | | | Change-Id: I96097ef8c6f198220f513bbc6d5f8881834a1491
* JGit v6.7.0.202309050840-rv6.7.0.202309050840-rMatthias Sohn2023-09-052-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ibe952d97bc178adb909cdd40f48957f5b68af699
* Prepare 6.7.0-SNAPSHOT buildsMatthias Sohn2023-08-302-2/+2
| | | | Change-Id: I49751232464e70b7d1dc3292a9f36b7a7015e44f
* JGit v6.7.0.202308301100-rc1v6.7.0.202308301100-rc1Matthias Sohn2023-08-302-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I712a9f6830364ed404d03f3a145c055906273544
* Prepare 6.7.0-SNAPSHOT buildsMatthias Sohn2023-08-032-2/+2
| | | | Change-Id: I936d2d9106a1e3b7a98ec89fec8ae8a92ec765f2
* JGit v6.7.0.202308011830-m2v6.7.0.202308011830-m2Matthias Sohn2023-08-022-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I255a979e9f48f60a251ef7b74ced3f720f012706
* Prepare 6.7.0-SNAPSHOT buildsMatthias Sohn2023-05-242-18/+18
| | | | Change-Id: I50ff7ee31046cfc29a087c8963be3deae24b1c9c
* Prepare 6.6.0-SNAPSHOT buildsMatthias Sohn2023-03-012-18/+18
| | | | Change-Id: I17893f9db12bcb208866f40a06cd4f1ccbb4fe30
* Prepare 6.5.0-SNAPSHOT buildsMatthias Sohn2022-11-232-18/+18
| | | | Change-Id: I4238b6181e96e22e540cf34802a332f868cb6dfb
* Prepare 6.4.0-SNAPSHOT buildsMatthias Sohn2022-09-142-18/+18
| | | | Change-Id: I47ca5f1d0263caa0bfc7c303042360c6c5ac4dec
* Prepare 6.3.1-SNAPSHOT buildsMatthias Sohn2022-09-122-18/+18
| | | | Change-Id: I44e159eca4131880d74d3078060e7e20f9b5ce76
* JGit v6.3.0.202209071007-rv6.3.0.202209071007-rMatthias Sohn2022-09-072-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Iea3fae9f6f6c5fb0a79f7684334a3e0059738c4f
* JGit v6.3.0.2022009070944-rMatthias Sohn2022-09-072-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I3cc78dbcf8c7970e80bf1499751611110ec2b30b
* Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-08-172-2/+2
| | | | Change-Id: Ie398b651c5308ec86812bf01fcc563d3e679c828
* JGit v6.3.0.202208161710-m3v6.3.0.202208161710-m3Matthias Sohn2022-08-162-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I0954d11a1f35eff196b157df3aa8386476c48a7e
* Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-06-072-18/+18
| | | | Change-Id: I092fdd2c35d85bf35e3ef700aa7078e6d304d977
* DirCacheCheckout: use a LinkedHashMap instead of HashMapThomas Wolf2022-03-191-8/+0
| | | | | | | | | | | This guarantees that updates are checked out in git order, which is important for LFS if a .lfsconfig file is used. That file comes early in git order, and the LFS smudge filter will consider the working tree version. To ensure that on branch switches the correct version of that file is used, the checkout order must be stable and should be the git order. Change-Id: I20f6d11bf08558f9d5adfd2be71e36321460038c Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* Fix MANIFEST.MF in the LFS bundlesThomas Wolf2022-03-121-0/+1
| | | | | | | Somehow new dependencies added in commit a229072f got lost when merging stable-6.1 into master. Change-Id: I19c16c6be73d07e05f37241a44cf25133ff467a5 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* Merge branch 'stable-6.1'Matthias Sohn2022-03-093-22/+537
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.1: Prepare 6.1.1-SNAPSHOT builds JGit v6.1.0.202203080745-r [checkout] Use .gitattributes from the commit to be checked out Don't use final for method parameters [push] support the "matching" RefSpecs ":" and "+:" [push] Call the pre-push hook later in the push process IndexDiff: use tree filter also for SubmoduleWalk Run license check with option -Ddash.projectId=technology.jgit Exclude transitive dependencies of sshd-sftp Update DEPENDENCIES for 6.1.0 release Add dependency to dash-licenses Fix typos of some keys in LfsText Sort LfsText entries alphabetically Support for "lfs.url" from ".lfsconfig" Change-Id: I1b9f0c0ed647837e00b9640d235dbfab2329c5a6
| * Prepare 6.1.1-SNAPSHOT buildsMatthias Sohn2022-03-082-18/+18
| | | | | | | | Change-Id: Ifc80355025d8459245843be1c24dc5a286913e77
| * JGit v6.1.0.202203080745-rv6.1.0.202203080745-rMatthias Sohn2022-03-082-2/+2
| | | | | | | | | | Change-Id: I8766ed400020c9571f321bbbfe34b0688af0107d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * [checkout] Use .gitattributes from the commit to be checked outThomas Wolf2022-03-071-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JGit used only one set of attributes constructed from the global and info attributes, plus the attributes from working tree, index, and HEAD. These attributes must be used to determine whether the working tree is dirty. But for actually checking out a file, one must use the attributes from global, info, and *the commit to be checked out*. Otherwise one may not pick up definitions that are only in the .gitattributes of the commit to be checked out or that are changed in that commit with respect to the attributes currently in HEAD, the index, or the working tree. Maintain in TreeWalk different Attributes per tree, and add operations to determine EOL handling and smudge filters per tree. Use the new methods in DirCacheCheckout and ResolveMerger. Note that merging in JGit actually used the attributes from the base, not those from ours, which looks dubious at least. It now uses those from ours, and for checking out the ones from theirs. The canBeContentMerged() determination was also done from the base attributes, and is newly done from the ours attributes. Possibly this should take into account all three attributes, and only if all three agree the item can be content merged, a content merge should be attempted? (What if the binary/text setting changes between base, ours, or theirs?) Also note that JGit attempts to perform content merges on non-binary LFS files; there it used the filter attribute from base, too, even for the ours and theirs versions. Newly it takes the filter attribute from the correct tree. I'm not convinced doing content merges on potentially huge files like LFS files is really a good idea. Add tests in FilterCommandsTest and LfsGitTest to verify the behavior. Open question: using index and working tree as fallback for the attributes of ours (assuming it is HEAD) is OK. But does it also make sense for base and theirs in merging? Bug: 578707 Change-Id: I0bf433e9e3eb28479b6272e17c0666e175e67d08 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * Support for "lfs.url" from ".lfsconfig"Matthias Fromme2022-03-033-21/+516
| | | | | | | | | | | | | | | | | | | | | | - New class LfsConfig to enrich repository configuration by settings from ".lfsconfig" file respecting configuration file precedence. - Adapted LfsConnectionFactory to use LfsConfig instead of directly using configuration from repository to calculate url of the lfs repository Bug: 578020 Change-Id: I156f4ec137c2e428136a2ca9b8a4011ecee2d915
| * Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2022-03-022-2/+2
| | | | | | | | Change-Id: I525fc1258a729c36d63fdb3c8170e9f04ad55cec
| * JGit v6.1.0.202203021511-rc1v6.1.0.202203021511-rc1Matthias Sohn2022-03-022-2/+2
| | | | | | | | | | Change-Id: I4c75a58fd76102e773af4f1f8a1487d5e7ffc7cf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2022-03-012-2/+2
| | | | | | | | Change-Id: I30a89277373ad62c857151532942e135e34d1d0c
| * JGit v6.1.0.202202221755-m3v6.1.0.202202221755-m3Matthias Sohn2022-02-222-2/+2
| | | | | | | | | | Change-Id: Idcd46e05ca3eec376f8ac83209dba0978e004f9a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 04:56:08 +0000