summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | UploadPack: Remove redundant specification of typeDavid Pursehouse2018-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I257635ed3f9ce012e03a3c45ed666fb9195019e0 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | Upgrade spotbugs to 3.1.6David Pursehouse2018-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id84497107ef9ee2eca3c9d65197ab8c14f492655 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | Add SuppressWarnings for FutureReturnValueIgnoredMasaya Suzuki2018-08-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://errorprone.info/bugpattern/FutureReturnValueIgnored The submitted task logs the error in case it fails. Change-Id: I280442ddb8046da47aeb79d005886f65d2e3067b Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
* | | | | | | Merge "Support remove-project node in the manifest parser"Jonathan Nieder2018-08-202-0/+29
|\ \ \ \ \ \ \
| * | | | | | | Support remove-project node in the manifest parserMasaya Suzuki2018-08-202-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This directive removes the projects added by other directives. https://gerrit.googlesource.com/git-repo/+/65b0ba5aa0447f7ee25103828115662b1eb80ff9/manifest_xml.py#614 https://gerrit.googlesource.com/git-repo/+/e469a0c741832f6584513f4a382d6b93f417b8d2/docs/manifest-format.txt#339 Change-Id: I90d7b9fc711b586dec05f475422d34d67d909986 Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
* | | | | | | | Remove unnecessary maven dependency of org.eclipse.jgit to httpclientMatthias Sohn2018-08-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icc3c696a46adaf0e7b633913a3f36f0440a81e3a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Update bazel dependencies to match maven dependenciesMatthias Sohn2018-08-201-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update - jsch to 0.1.54 - httpclient to 4.5.5 - httpcore to 4.4.9 - commons-codec to 1.10 - commons-logging to 1.2 - junit to 4.12 Change-Id: I84eeb8dd786e68dd03079ae2c2aef5d7286dfb56 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | SubmoduleDeinitTest fails on WindowsAndrey Loskutov2018-08-192-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 538068 Change-Id: I982e8b12936582e8e119f45d7a3bf4888d3e0e1a Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* | | | | | | | FilterCommandsTest fails on WindowsAndrey Loskutov2018-08-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 538068 Change-Id: I3ba6fceef2c34cacc0c37150206379aa93b5e3d0 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* | | | | | | | ReceivePackAdvertiseRefsHookTest.testSuccess() fails on WindowsAndrey Loskutov2018-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TransportLocal object created in newTransportLocalWithStrictValidation() closes original repository and increments use of test internal "dst" repository, but never decrements use. Because of this, pack file is not closed and during tearDown on Windows system is unable to delete it. Bug: 538068 Change-Id: I96df8e91abfee78c91cf26c2466718e9145a69db Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* | | | | | | | Update Jetty to 9.4.11.v20180605Matthias Sohn2018-08-1812-110/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d2ad0536a0fd02361e17d0175eaeca2c047660c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Merge branch 'stable-5.0'Matthias Sohn2018-08-182-55/+22
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Fix GC run in foreground to not use executor Change-Id: I484391e5589d70de136126d153f886f5afa12e88 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-08-182-55/+22
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Fix GC run in foreground to not use executor Change-Id: I9bb1506805a2d5e79a420a1152bc45321c081229 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-08-182-55/+22
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Fix GC run in foreground to not use executor Change-Id: I565b95de6c89f021475667caaacdbb08caddd881 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2018-08-182-55/+22
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Fix GC run in foreground to not use executor Change-Id: Ib4d76125fca7eec9e88666688b5e614e7e20dde7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | | Merge branch 'stable-4.8' into stable-4.9Matthias Sohn2018-08-182-55/+22
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Fix GC run in foreground to not use executor Change-Id: Id9d864a8e727fefa35ca87eccb4e3801eb689c3c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | Merge branch 'stable-4.7' into stable-4.8Matthias Sohn2018-08-182-55/+22
| | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Fix GC run in foreground to not use executor Change-Id: Ib150d132e2ce055d36ddffb2dbc37b5cb355e77a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | Fix GC run in foreground to not use executorHugo Arès2018-08-152-55/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since I3870cadb4, GC task was always delegated to an executor even when background option was set to false. This was an issue because if more than one GC object was instantiated and executed in parallel, only one GC was actually running because of the single thread executor. Change-Id: I8c587d22d63c1601b7d75914692644a385cd86d6 Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
* | | | | | | | Update org.apache.commons.codec and org.apache.commons.loggingMatthias Sohn2018-08-185-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update - org.apache.commons.codec to 1.10.0.v20180409-1845 - org.apache.commons.logging to 1.2.0.v20180409-1502 According to [1] this is required for the update of httpcore and httpclient we did in 63a3e415. [1] https://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg15823.html CQ: 16962 CQ: 16963 Change-Id: I1d40ffc90d17fe2c29ad704013535f20af4b231b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Merge branch 'stable-5.0'Matthias Sohn2018-08-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Fix wrong warning message in case of lock failures Change-Id: Ia9b813652a2f5b6c78e9587367c35c3a6c177a7a
| * | | | | | | Fix wrong warning message in case of lock failuresChristian Halstrick2018-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 537969 Change-Id: I0854bbbe7393abaca36640d429886c30d95d5bf1
* | | | | | | | Update apache httpcore and httpclientMatthias Sohn2018-08-1710-43/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update - org.apache.httpcomponents.httpclient to 4.5.5.v20180409-1525 - org.apache.httpcomponents.httpcore to 4.4.9.v20180409-1525 CQ: 16959 CQ: 16960 Change-Id: I11f2979e1c39fe26421693a7c694e51c471326a0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Introduce ProtocolV2HookMasaya Suzuki2018-08-165-32/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Git protocol v2, UploadPack and ReceivePack have the same capabilities and can process any protocol v2 request. For example, a client can sent a "fetch" command to the "/git-receive-pack" endpoint. This makes it difficult for existing hook interfaces. For example, PreUploadHook takes UploadPack, but a "fetch" command may be received by ReceivePack. To resolve this skew, this change introduce a different hook interface for the protocol v2. The hook takes a request that is independent to the handlers (UploadPack, ReceivePack). Also this makes it clear what parameters the hook is counting on, instead of keep track of the hook using getters from UploadPack / ReceivePack. Bug: 534847 Change-Id: I71f3266584483db1e2b2edfc1a72d0bdf1bb6041 Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
* | | | | | | | Add EMPTY_TREE_ID as a sibling of EMPTY_BLOB_IDDave Borowitz2018-08-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id68b3e1db7294cf9adb8b4ce8eecb1d828687eef
* | | | | | | | Update javadoc for EMPTY_BLOB_IDDave Borowitz2018-08-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found original version with: $ git describe --contains $(git blame fc4d4b5340911989e444b150ae6a859f486feba9 org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java | grep EMPTY_BLOB_ID | cut -d' ' -f1) v0.9.1~164 Change-Id: I1f86bde42615c8b64064894bde44f82660b38d0f
* | | | | | | | Merge "Declare ConfigConstants and GitProtocolConstants final"Jonathan Nieder2018-08-143-2/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Declare ConfigConstants and GitProtocolConstants finalMatthias Sohn2018-08-153-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | Respond with shallow-info before wanted-refsJonathan Tan2018-08-132-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fetching with protocol v2, git expects the shallow-info section to appear before wanted-refs if both appear in the response. Teach UploadPack to do this. Change-Id: Ie26a91edcce5d27a1d727d7fba5c30e1144e118b Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
* | | | | | | | | Use a TreeMap to construct the list of renamed projectsHan-Wen Nienhuys2018-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminates one source of unpredictable ordering of entries in .gitmodules. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: I834ae57bd18f51966ef76c039f5212ebf60a33e8
* | | | | | | | | Merge "Fix ResolveMerger: rebase with autocrlf=true, direct checkout"Gunnar Wagenknecht2018-08-134-18/+149
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix ResolveMerger: rebase with autocrlf=true, direct checkoutThomas Wolf2018-08-134-18/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResolveMerger.checkout() and cleanUp() check out files directly and must honor CR/LF settings and also smudge filters. Deprecate the 3-argument version of DirCacheCheckout.checkoutEntry(). It isn't used anymore anywhere in JGit (nor in EGit). Bug: 537410 Change-Id: I062b35401c8bd5bc99deb2f68f91089a0643504c Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | Support protocol v2 want-ref in UploadPackJonathan Tan2018-08-104-0/+279
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadPack already allows the client to send wanted OIDs as "want" lines. Extend UploadPack to also allow the client to send wanted ref names as "want-ref" lines when the fetch is done using protocol v2. The corresponding Git commit is 516e2b76bd ("upload-pack: implement ref-in-want", 2018-06-28). To support a two-stage rollout, two configuration variables are provided: uploadpack.allowrefinwant (default "false") allows clients to specify "want-ref" in their requests, and uploadpack.advertiserefinwant (default "true") makes UploadPack advertise this capability. If uploadpack.allowrefinwant is true but uploadpack.advertiserefinwant is false, UploadPack will not advertise that it supports "want-ref", but it will support it. Change-Id: I3c24077949640d453af90d81a7f48ce4b8ac9833 Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
* | | | | | | | Merge remote-tracking branch 'origin/stable-5.0'Thomas Wolf2018-08-091-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Ensure that JSch knows HostKeyAlgorithms ssh-rsa and ssh-dss Change-Id: I76899a1f6b3d9348d138266e05e1320b7429bfd1 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | | | | | Ensure that JSch knows HostKeyAlgorithms ssh-rsa and ssh-dssThomas Wolf2018-08-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without these registrations, JSch's up-front checks which algorithms are available at all fail if the ssh config explicitly sets only these algorithms. Bug: 537790 Change-Id: Idb0431190a7f101913363ee95af6c8fcbda6c923 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | Fix API breakage introduced by da254106Matthias Sohn2018-08-084-47/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use org.eclipse.jgit.errors.CancelledException which is a subclass of IOException instead of org.eclipse.jgit.api.errors.CanceledException in order to avoid breaking API. We can reconsider this with the next major version 6.0. Bug: 536324 Change-Id: Ia6f84f59aa6b7d78b8fccaba24ade320a54f7458 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | Abort rename detection in a timely manner if cancelledMatthias Sohn2018-08-076-25/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If progress monitor is cancelled break loops in rename detection by throwing a CanceledException. Bug: 536324 Change-Id: Ia3511fb749d2a5d45005e72c156b874ab7a0da26 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | RebaseCommand: Remove unnecessary fall through commentsJonathan Nieder2018-08-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's easier to read a list of cases case A: case B: case C: ... do something ...; break; without intervening "// fall through" lines separating the cases. This also makes it clearer that JGit uses "$FALL-THROUGH$", not "fall through", to suppress fallthrough warnings in switch statements. Eclipse does not pay attention to the second comment style. Change-Id: I5279a727aee2868854d06bfcaac8cb8186b4299e Signed-off-by: Jonathan Nieder <jrn@google.com>
* | | | | | | | Merge branch 'stable-5.0'Matthias Sohn2018-08-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Prepare 5.0.3-SNAPSHOT builds JGit v5.0.2.201807311906-r Prepare 4.11.2-SNAPSHOT builds JGit v4.11.1.201807311124-r Prepare 4.9.4-SNAPSHOT builds JGit v4.9.3.201807311005-r Change-Id: Ic8a748dbd02187fd783478b702c5795d88e7fe20 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | Prepare 5.0.3-SNAPSHOT buildsMatthias Sohn2018-08-0156-357/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae9d763a65481b09af6e19b33e41375f27038357 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | JGit v5.0.2.201807311906-rv5.0.2.201807311906-rMatthias Sohn2018-08-0156-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iccb98c03a069fee85a52325e1ed22cba8b76bcd8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-08-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.11.2-SNAPSHOT builds JGit v4.11.1.201807311124-r Prepare 4.9.4-SNAPSHOT builds JGit v4.9.3.201807311005-r Change-Id: I8c8ecc818205e1f5d94c02b463792ea1d72d8ba1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | Prepare 4.11.2-SNAPSHOT buildsMatthias Sohn2018-07-3156-356/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02630900ab131478b30abe68b2133d2c8a5a67ab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | JGit v4.11.1.201807311124-rv4.11.1.201807311124-rMatthias Sohn2018-07-3156-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic58a916d7e2c380b84690afa5e3517c6c178af8c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-07-310-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Prepare 4.9.4-SNAPSHOT builds JGit v4.9.3.201807311005-r Change-Id: I5f73f240951733e8d81d634aa5340a0861936a0c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2018-07-310-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Prepare 4.9.4-SNAPSHOT builds JGit v4.9.3.201807311005-r Change-Id: Ifd4b815b0f66d44afeafa9ae77a2a714942d675d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | | Prepare 4.9.4-SNAPSHOT buildsMatthias Sohn2018-07-3156-333/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb2ee9d00d5d049f681e1abbb449656105e553a7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | | JGit v4.9.3.201807311005-rv4.9.3.201807311005-rMatthias Sohn2018-07-3156-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f4f437649736c6a27e78d536344c7b31c8a0f65 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Merge "Use project names instead of paths for the submodule name"Jonathan Nieder2018-07-272-62/+123
|\ \ \ \ \ \ \ \
| * | | | | | | | Use project names instead of paths for the submodule nameMasaya Suzuki2018-07-272-62/+123
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two submodules at the same path on different branches need not represent the same repository, and two submodules at different paths can represent the same one. The C Git implementation uses the submodule name to internally manage the submodule repositories under .git/modules. When a submodule represents different repositories in different branches, it makes a conflict inside .git/modules. The current RepoCommand implementation uses submodule paths as the submodule names. When the manifest file mounts different repositories to the same path in different branches, this makes a situation described above. To solve this issue, we can use the project name instead of the path as the submodule name. On the other hand, since repo v1.12.8~3^2 (repo: Support multiple branches for the same project., 2013-10-11), a manifest file can mount the same project to different paths. If we naively use the project name as the submodule name, it makes a conflict in .git/modules, too. This patch uses the project name as the submodule name basically, but when the same project is mounted to different paths, it uses the project name and path as the submodule name. Change-Id: I09dc7d62ba59016fe28852d3139a56ef7ef49b8f Signed-off-by: Masaya Suzuki <masayasuzuki@google.com> Reported-by: JP Sugarbroad <jpsugar@google.com>
* | | | | | | | Merge branch 'stable-5.0'Matthias Sohn2018-07-275-28/+53
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Prepare 4.7.3-SNAPSHOT builds JGit v4.7.2.201807261330-r Delete all loose refs empty directories Use java.nio to delete path to get detailed errors GC: Remove empty references folders Do not ignore path deletion errors Change-Id: I9717444c42ea89195dfcde8bb10121b9bb178e87 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-25 08:37:09 +0000