summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.junit
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | | * | | | | JGit v5.7.0.202003090808-rv5.7.0.202003090808-rMatthias Sohn2020-03-093-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia23bffa3952687f6107d496a8932d54b11c12412 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * | | | | | Prepare 5.8.2-SNAPSHOT buildsMatthias Sohn2020-07-143-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I33327417cd5f5b55e860c5d9c6ee06cac7d10b44 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * | | | | | JGit v5.8.1.202007141445-rv5.8.1.202007141445-rMatthias Sohn2020-07-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib63831292eded15af18ed30a9653831dadfd0d4a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * | | | | | Prepare 5.8.1-SNAPSHOT buildsMatthias Sohn2020-06-093-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic654fb45abe4e94f4eee532af0f4278d372d37f5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * | | | | | JGit v5.8.0.202006091008-rv5.8.0.202006091008-rMatthias Sohn2020-06-093-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2020e9821c359b90b7c830031945e2fc659ea607 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * | | | | | Prepare 5.8.0-SNAPSHOT buildsMatthias Sohn2020-05-073-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7d763b3b02b4d2a7a4141d2d9d715855dd69918 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * | | | | | JGit v5.8.0.202005061305-m2v5.8.0.202005061305-m2Matthias Sohn2020-05-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d9e5a9e000a74513896744cc3646430cb872893 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | | | | | | Prepare 5.9.1-SNAPSHOT buildsMatthias Sohn2020-09-083-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9006e7961111982943ffef496d15bd525959b3e4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | | | | | | JGit v5.9.0.202009080501-rv5.9.0.202009080501-rMatthias Sohn2020-09-083-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic98ae61b3f327ef72256fd9b2e28510e3a481de7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | | | | | | Merge branch 'master' into stable-5.9Matthias Sohn2020-09-051-0/+16
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: SshdSession: close channel gracefully jgit: Add DfsBundleWriter Prepare 5.10.0-SNAPSHOT builds ResolveMerger: do not content-merge gitlinks on del/mod conflicts ResolveMerger: Adding test cases for GITLINK deletion ResolveMerger: choose OURS on gitlink when ignoreConflicts ResolveMerger: improving content merge readability ResolveMerger: extracting createGitLinksMergeResult method ResolveMerger: Adding test cases for GITLINK merge Back out the version change to 5.10.0-SNAPSHOT which was done on master already. Change-Id: I1a6b1f0b8f5773be47823d74f593d13b16a601d5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | | | | | | | Prepare 5.9.0-SNAPSHOT buildsMatthias Sohn2020-08-273-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia3e8382ec503150979d8acb6161031ccfb7fd921 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | | | | | | | JGit v5.9.0.202008260805-m3v5.9.0.202008260805-m3Matthias Sohn2020-08-263-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic4de8340f3ab038e38b239b725b8bd6d6dbee413 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | | | | | | | Prepare 5.10.1-SNAPSHOT buildsMatthias Sohn2020-12-083-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1e44edfa0a80a29c00ed5112291d1338baf56f1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | | | | | | | JGit v5.10.0.202012080955-rv5.10.0.202012080955-rMatthias Sohn2020-12-083-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ca88bcc54992625a6fafd84172adee58d487dc3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | | | | | | | Prepare 5.10.0-SNAPSHOT buildsMatthias Sohn2020-12-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9cc9fa32a737b4916cdb5b52bac8f724ebee09bc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | | | | | | | JGit v5.10.0.202012021225-rc1v5.10.0.202012021225-rc1Matthias Sohn2020-12-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic774356e09bb9d24e5d99334bd4ea173bd4071ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | | | | | | | Prepare 5.10.0-SNAPSHOT buildsMatthias Sohn2020-11-253-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iabc845edf565ac706344f68f854384faa63b6f43 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | | | | | | | JGit v5.10.0.202011251205-m3v5.10.0.202011251205-m3Matthias Sohn2020-11-253-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id58d8eb49f550e62b04053a71366f7eabd9f9a53 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | | | | | | | Prepare 5.10.0-SNAPSHOT buildsMatthias Sohn2020-11-043-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie13f90948669c8cdebd14e74a91df9daf0387ccf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | | | | | | | JGit v5.10.0.202011041322-m2v5.10.0.202011041322-m2Matthias Sohn2020-11-043-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2709321f61f61208350eaa8aa48e56b88455146 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | | | | | | | | Prepare 5.11.2-SNAPSHOT buildsMatthias Sohn2021-05-143-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfd81bd3bbcd99034f69fffb1a562bf07b0f8209 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | | | | | | | | JGit v5.11.1.202105131744-rv5.11.1.202105131744-rMatthias Sohn2021-05-133-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id74eecbde63edbc58b6262ae01ef34d8bebc0f88 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | | Prepare 5.13.1-SNAPSHOT buildsMatthias Sohn2021-09-083-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2f689d8d13eab022da5b5e83d6d6bebc1bb81d3
| | * | | | | | | | | | | | JGit v5.13.0.202109080827-rv5.13.0.202109080827-rMatthias Sohn2021-09-083-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3b2d4256712cc7e577c23e75c0d4ad940870e72 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | | Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-09-013-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a1d7ab24d5ca718348f4ce3cda351553e48cd1f
| | * | | | | | | | | | | | JGit v5.13.0.202109011149-rc1v5.13.0.202109011149-rc1Matthias Sohn2021-09-013-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8d0970102f18e61a2fc7cf941267c9089d71c1a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | | Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-08-253-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6db044fdd57b60adbc2dd078c4af8cb54bb331c3
| | * | | | | | | | | | | | JGit v5.13.0.202108250949-m3v5.13.0.202108250949-m3Matthias Sohn2021-08-253-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icc079b28327f5a02256f9a06837c2be6352ea6e3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | | Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-06-143-23/+23
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9cfc1eeb0eda7b2bbe744a22a7e4cfe6d59bc37
| | * | | | | | | | | | | Prepare 5.12.1-SNAPSHOT buildsMatthias Sohn2021-06-133-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf266c34aa9a04cf9c5e0e09bcb415c13d773d4c
| | * | | | | | | | | | | JGit v5.12.0.202106070339-rv5.12.0.202106070339-rMatthias Sohn2021-06-073-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0fbfea2c83f1ce83f75130cc97591547032f1104 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-033-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc72d3f3ac84b9c4055b95ec0093d877ffb09ab0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | JGit v5.12.0.202106021050-rc1v5.12.0.202106021050-rc1Matthias Sohn2021-06-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I622ee049f14f37504ff4a062f03d6fc25465d0ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25e4efc9b40ae4e7168b37385445c73992c5beb0
| | * | | | | | | | | | | JGit v5.12.0.202106011439-rc1v5.12.0.202106011439-rc1Matthias Sohn2021-06-013-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieac1d02879defe0f4791062448d4efc328a2f652 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-013-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If563be77aab768ac1f31ae2211fb0892d0205a2a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | JGit v5.12.0.202105261145-m3v5.12.0.202105261145-m3Matthias Sohn2021-05-263-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b1af2032227900e6e0c6189f47bace1df67f0ab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-05-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2fc5305e7eaaa4593d418fc3b31d20e4b6e1e585
| | * | | | | | | | | | | JGit v5.12.0.202105051250-m2v5.12.0.202105051250-m2Matthias Sohn2021-05-053-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7d86c91ec0ff9aa0678dcb971c197e62a4ca2dc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | | | | | Prepare 6.0.1-SNAPSHOT buildsMatthias Sohn2021-11-293-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iddb67ed9578293b83b8147aa18dd8319426f83d1
| * | | | | | | | | | | | JGit v6.0.0.202111291000-rv6.0.0.202111291000-rMatthias Sohn2021-11-293-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6441d9226e8131552bfafe1fb2c353f2e07e42ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | | | | | Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn2021-11-243-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e06186cf62681767962e391331cc65bafddc205
| * | | | | | | | | | | | JGit v6.0.0.202111241155-rc1v6.0.0.202111241155-rc1Matthias Sohn2021-11-243-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35dc089a00ee12f83f506fb320d23762fa030063 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | | | | | Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn2021-11-173-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibfc7fb21b039fe2a7669c8dee3c10f5ade33d520
| * | | | | | | | | | | | JGit v6.0.0.202111161950-m3v6.0.0.202111161950-m3Matthias Sohn2021-11-173-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6c36994be05848c567d3d664eb683d9bed26c48 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | | | | | Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn2021-10-283-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff7b4f834ecb43c7a0a9bf79bb8b30dd10d1fa07
| * | | | | | | | | | | | JGit v6.0.0.202110270955-m2v6.0.0.202110270955-m2Matthias Sohn2021-10-273-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8057bbbf6acd478ad062e30cf5cbfc287531a66a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | | | | | Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn2021-10-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac4504923b34e29b5981cb77fdbe9e4cac7e625e
| * | | | | | | | | | | | JGit v6.0.0.202110060947-m1v6.0.0.202110060947-m1Matthias Sohn2021-10-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I182115d974d5ef3e611e0e082667d7e51d8babd0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | | | | | Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2021-11-243-23/+23
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied07b1298bd32672a5025cec5079440ab9b9a100