aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/META-INF
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-07-061-0/+1
|\ | | | | | | | | | | | | | | | | | | * stable-6.1: UploadPack: don't prematurely terminate timer in case of error Do not create reflog for remote tracking branches during clone UploadPack: do not check reachability of visible SHA1s Add missing package import javax.management to org.eclipse.jgit Change-Id: Ib3ff6a038e1b92a931a7f2624c19bbefd8cb95fd
| * Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2022-07-061-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.0: UploadPack: don't prematurely terminate timer in case of error Do not create reflog for remote tracking branches during clone UploadPack: do not check reachability of visible SHA1s Add missing package import javax.management to org.eclipse.jgit Change-Id: I08734ee2c8f3296d908da6a29d53ed87c4b48eb2
| | * Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2022-07-061-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: UploadPack: don't prematurely terminate timer in case of error Do not create reflog for remote tracking branches during clone UploadPack: do not check reachability of visible SHA1s Add missing package import javax.management to org.eclipse.jgit Change-Id: I6db0a4d74399fde892eeec62efd2946f97547a5d
| | | * Add missing package import javax.management to org.eclipse.jgitMatthias Sohn2022-06-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Class org.eclipse.jgit.util.Monitoring uses JMX hence we need this import otherwise OSGi applications can face ClassNotFoundException. Bug: 577018 Change-Id: Ifd75337b87c7faec95d333b771bb0a2f3e46a418
| | | * Prepare 5.13.2-SNAPSHOT buildsMatthias Sohn2022-06-142-53/+53
| | | | | | | | | | | | | | | | Change-Id: I4862e5d80a7d95a1a119d06306e3f6927445d1d3
| | | * JGit v5.13.1.202206130422-rv5.13.1.202206130422-rMatthias Sohn2022-06-132-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ife74d64e8171c68dbf08271492c0ac852a6dc51c
| | | * Prepare 5.13.1-SNAPSHOT buildsMatthias Sohn2021-09-082-53/+53
| | | | | | | | | | | | | | | | Change-Id: Ib2f689d8d13eab022da5b5e83d6d6bebc1bb81d3
| | | * JGit v5.13.0.202109080827-rv5.13.0.202109080827-rMatthias Sohn2021-09-082-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: If3b2d4256712cc7e577c23e75c0d4ad940870e72 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-09-012-3/+3
| | | | | | | | | | | | | | | | Change-Id: I2a1d7ab24d5ca718348f4ce3cda351553e48cd1f
| | | * JGit v5.13.0.202109011149-rc1v5.13.0.202109011149-rc1Matthias Sohn2021-09-012-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Id8d0970102f18e61a2fc7cf941267c9089d71c1a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-08-252-3/+3
| | | | | | | | | | | | | | | | Change-Id: I6db044fdd57b60adbc2dd078c4af8cb54bb331c3
| | | * JGit v5.13.0.202108250949-m3v5.13.0.202108250949-m3Matthias Sohn2021-08-252-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Icc079b28327f5a02256f9a06837c2be6352ea6e3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-06-142-53/+53
| | | | | | | | | | | | | | | | Change-Id: Ie9cfc1eeb0eda7b2bbe744a22a7e4cfe6d59bc37
| | | * Prepare 5.12.1-SNAPSHOT buildsMatthias Sohn2021-06-132-53/+53
| | | | | | | | | | | | | | | | Change-Id: Idf266c34aa9a04cf9c5e0e09bcb415c13d773d4c
| | | * JGit v5.12.0.202106070339-rv5.12.0.202106070339-rMatthias Sohn2021-06-072-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I0fbfea2c83f1ce83f75130cc97591547032f1104 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-032-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifc72d3f3ac84b9c4055b95ec0093d877ffb09ab0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * JGit v5.12.0.202106021050-rc1v5.12.0.202106021050-rc1Matthias Sohn2021-06-022-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I622ee049f14f37504ff4a062f03d6fc25465d0ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-022-3/+3
| | | | | | | | | | | | | | | | Change-Id: I25e4efc9b40ae4e7168b37385445c73992c5beb0
| | | * JGit v5.12.0.202106011439-rc1v5.12.0.202106011439-rc1Matthias Sohn2021-06-012-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ieac1d02879defe0f4791062448d4efc328a2f652 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-012-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: If563be77aab768ac1f31ae2211fb0892d0205a2a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * JGit v5.12.0.202105261145-m3v5.12.0.202105261145-m3Matthias Sohn2021-05-262-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I3b1af2032227900e6e0c6189f47bace1df67f0ab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-05-062-3/+3
| | | | | | | | | | | | | | | | Change-Id: I2fc5305e7eaaa4593d418fc3b31d20e4b6e1e585
| | | * JGit v5.12.0.202105051250-m2v5.12.0.202105051250-m2Matthias Sohn2021-05-052-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic7d86c91ec0ff9aa0678dcb971c197e62a4ca2dc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-03-102-53/+53
| | | | | | | | | | | | | | | | | | | | Change-Id: I736de7c3deb11da75777d459f47332df0b486443 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.11.1-SNAPSHOT buildsMatthias Sohn2021-03-092-53/+53
| | | | | | | | | | | | | | | | | | | | Change-Id: I94628ccbb5099a65aa4345cfd28a141ff5555b68 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * JGit v5.11.0.202103091610-rv5.11.0.202103091610-rMatthias Sohn2021-03-092-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I8e6855eaf7228459f492036feb4e34ca085698a7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.11.0-SNAPSHOT buildsMatthias Sohn2021-03-042-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I89ed49a6acc53dd75d16f40c99e1140e0c18f646 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * JGit v5.11.0.202103031150-rc1v5.11.0.202103031150-rc1Matthias Sohn2021-03-032-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I0a86fa59645888f9f36ea6938c9121e095f02fc6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.11.0-SNAPSHOT buildsMatthias Sohn2021-02-242-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: If3dbe084ee37ae4b993d3a10ec48b14e8709ff6d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * JGit v5.11.0.202102240950-m3v5.11.0.202102240950-m3Matthias Sohn2021-02-242-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Iea6b3515fa63db497989194b6bf50fe7324086d0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.11.0-SNAPSHOT buildsMatthias Sohn2021-02-032-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I191674448c4a220e61ec5f0c181c0809eb873166 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * JGit v5.11.0.202102031030-m2v5.11.0.202102031030-m2Matthias Sohn2021-02-032-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie14c162a7fc5e1e8f34bf4bbc944f4dbe13e4dd0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | Prepare 6.0.1-SNAPSHOT buildsMatthias Sohn2021-11-292-53/+53
| | | | | | | | | | | | | | | | Change-Id: Iddb67ed9578293b83b8147aa18dd8319426f83d1
| | * | JGit v6.0.0.202111291000-rv6.0.0.202111291000-rMatthias Sohn2021-11-292-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I6441d9226e8131552bfafe1fb2c353f2e07e42ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn2021-11-242-3/+3
| | | | | | | | | | | | | | | | Change-Id: I4e06186cf62681767962e391331cc65bafddc205
| | * | JGit v6.0.0.202111241155-rc1v6.0.0.202111241155-rc1Matthias Sohn2021-11-242-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I35dc089a00ee12f83f506fb320d23762fa030063 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn2021-11-172-3/+3
| | | | | | | | | | | | | | | | Change-Id: Ibfc7fb21b039fe2a7669c8dee3c10f5ade33d520
| | * | JGit v6.0.0.202111161950-m3v6.0.0.202111161950-m3Matthias Sohn2021-11-172-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: If6c36994be05848c567d3d664eb683d9bed26c48 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | Prepare 6.1.1-SNAPSHOT buildsMatthias Sohn2022-03-082-54/+54
| | | | | | | | | | | | | | | | Change-Id: Ifc80355025d8459245843be1c24dc5a286913e77
| * | | JGit v6.1.0.202203080745-rv6.1.0.202203080745-rMatthias Sohn2022-03-082-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I8766ed400020c9571f321bbbfe34b0688af0107d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2022-03-022-3/+3
| | | | | | | | | | | | | | | | Change-Id: I525fc1258a729c36d63fdb3c8170e9f04ad55cec
| * | | JGit v6.1.0.202203021511-rc1v6.1.0.202203021511-rc1Matthias Sohn2022-03-022-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I4c75a58fd76102e773af4f1f8a1487d5e7ffc7cf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2022-03-012-3/+3
| | | | | | | | | | | | | | | | Change-Id: I30a89277373ad62c857151532942e135e34d1d0c
| * | | JGit v6.1.0.202202221755-m3v6.1.0.202202221755-m3Matthias Sohn2022-02-222-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Idcd46e05ca3eec376f8ac83209dba0978e004f9a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Prepare 6.2.1-SNAPSHOT buildsMatthias Sohn2022-06-072-54/+54
| | | | | | | | | | | | | | | | Change-Id: I4a0f3919ff43a3b9fafa85b8ecec2d760b7eb161
* | | | JGit v6.2.0.202206071550-rv6.2.0.202206071550-rMatthias Sohn2022-06-072-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ib4ae85a0cabcc9cb867f2c85034d72fb676a500a
* | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-06-062-3/+3
| | | | | | | | | | | | | | | | Change-Id: Id2ad8d5b561620723b2c52c86909321d628de12f
* | | | Merge branch 'master' into stable-6.2Andrey Loskutov2022-06-031-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Adapt diff- and merge tool code for PGM and EGit usage Teach JGit to handle external diff/merge tools defined in .gitattributes Change-Id: I3aefc14160caaac859bd3548460dd755ebe42fc5
| * | | | Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see: https://git-scm.com/docs/git-mergetool * DiffTools and MergeTools * store FS, gitDir and workTree for usage without git repository (for EGit preferences) * add getUserDefinedToolNames() and getPredefinedToolNames() * replace getToolNames() with getAllToolNames() that combines the two lists and put default tool name (diff.tool or merge.tool) as first element (for EGit preferences) * FileElement: refactoring of getFile() and friends to have midName (LOCAL, REMOTE etc.) always added to the temp file name (also for EGit) * FileElement: added directory attribute that is used in getFile() to return path with workDir as parent * DiffTool and MergeTool * added errw.flush(), because sometimes stderr is not printed in case of die() * print e.getMessage() always to stderr * Moved toolname and prompt logic into managers * Exported internal packages required for egit.ui Bug: 356832 Change-Id: I71e7f4dc362169a7612ca4f6546a021bc4b2b5f4 Signed-off-by: Andre Bossert <andre.bossert@siemens.com> Signed-off-by: Tim Neumann <Tim.Neumann@advantest.com>
* | | | | JGit v6.2.0.202206011217-rc1v6.2.0.202206011217-rc1Matthias Sohn2022-06-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Id9639b466583d8c373ef700402cb685ce4a8ee15
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 09:03:05 +0000