summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix Mylyn commit message templateMichael Keppler2018-09-2325-25/+25
| | | | | | | | The commit message template contains a superfluous blank at the end of the first line, which is deleted by this change. This is only relevant for jgit contributors using Eclipse, not for jgit users. Change-Id: I462deb49c26fb64b3dc2d1d75f1e40ef302b0fc9 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
* Bazel: Provide toolchain with activated error prone warningsDavid Ostrovsky2018-09-221-0/+107
| | | | | | | | | | | | | | | | | | On recent bazel versions it's trivial to apply package specific checks. Provide custom java toolchain with all error prone warnings activated. The list of all error prone warnings was borrowed from here: [1]. Test Plan: $ bazel build --java_toolchain //tools:error_prone_warnings_toolchain \ //... [1] https://github.com/bazelbuild/BUILD_file_generator/blob/master/tools/bazel_defs/java.bzl Change-Id: I207a368555bfb7ddab8d782d46d563ce779a6211 Signed-off-by: David Ostrovsky <david@ostrovsky.org> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Config.set-methods should not touch lines from included filesMarc Strapetz2018-09-202-17/+335
| | | | | | Bug: 538270 Change-Id: I4128213e83e267eb2667f451b8fb3301dd251656 Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* Don't inline included configs on FileBasedConfig.save()Marc Strapetz2018-09-202-0/+54
| | | | | | Bug: 529825 Change-Id: Id23d4602aa2082d7f2dfe15ae92d7b175b1b8944 Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* ConfigLine.includedFrom stores source, if it was read from included fileMarc Strapetz2018-09-202-5/+10
| | | | | | | This is a base change which prepares for subsequent bugfixes. Change-Id: Iaadc93df37e45753d700be73669e68c03590adb5 Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* Merge branch 'stable-5.1'Matthias Sohn2018-09-180-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Prepare 5.1.2-SNAPSHOT builds JGit v5.1.1.201809181055-r Prepare 4.11.4-SNAPSHOT builds JGit v4.11.3.201809181037-r Prepare 4.9.6-SNAPSHOT builds JGit v4.9.5.201809180939-r Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I50466bd95ac88a5a8f03ef52d9a59be46b13f81e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 5.1.2-SNAPSHOT buildsMatthias Sohn2018-09-1856-357/+357
| | | | | | | | | | Change-Id: I095d246e27de747a234bc058725454c222be51ce Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v5.1.1.201809181055-rv5.1.1.201809181055-rMatthias Sohn2018-09-1856-59/+59
| | | | | | | | | | Change-Id: I2366444fca125139eadb6d513be721167a266d70 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'stable-5.0' into stable-5.1Matthias Sohn2018-09-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Prepare 4.11.4-SNAPSHOT builds JGit v4.11.3.201809181037-r Prepare 4.9.6-SNAPSHOT builds JGit v4.9.5.201809180939-r Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I2ee1da73b4eb26f0017dd13a983aca62d4161c61 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-09-180-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.11.4-SNAPSHOT builds JGit v4.11.3.201809181037-r Prepare 4.9.6-SNAPSHOT builds JGit v4.9.5.201809180939-r Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I3f43af45a4c9023f0e8638fa1920db5d69276502 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 4.11.4-SNAPSHOT buildsMatthias Sohn2018-09-1856-356/+356
| | | | | | | | | | | | | | | | | | | | Change-Id: Id2f83eb3b2070637997cfece59f4f15698267908 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * JGit v4.11.3.201809181037-rv4.11.3.201809181037-rMatthias Sohn2018-09-1856-59/+59
| | | | | | | | | | | | | | | | | | | | Change-Id: I6b57b02e41f02916127b1866d573a634d6f6d796 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-09-180-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Prepare 4.9.6-SNAPSHOT builds JGit v4.9.5.201809180939-r Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I6633f1e147444385c999a6ff1d443b8a07d08bfc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2018-09-180-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I19b9be956b4e9bb1bba303ad879baac250988e8e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Prepare 4.9.6-SNAPSHOT buildsMatthias Sohn2018-09-1856-333/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9fb8f6cc45409e0884b898187323ac91953754c3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * JGit v4.9.5.201809180939-rv4.9.5.201809180939-rMatthias Sohn2018-09-1856-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36199607f3ec6e8bb841e9d9eade12251312447c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Merge branch 'stable-4.8' into stable-4.9Matthias Sohn2018-09-180-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: Ic353f93864ca4aec315f398f5c3e047dcda23125 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * Merge branch 'stable-4.7' into stable-4.8Matthias Sohn2018-09-180-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I9a9abcd2e48e19295d537241c951308cd0210019 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * Prepare 4.7.5-SNAPSHOT buildsMatthias Sohn2018-09-1856-321/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifce4311fe9429d751cec5b326b540d6233762153 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * JGit v4.7.4.201809180905-rv4.7.4.201809180905-rMatthias Sohn2018-09-1856-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iceee69df5fd593bece4532d5781e3771f5761ef8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * Update API problem filterMatthias Sohn2018-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie15c7d0b320f75915c362f5bd3bd6b39d84a900a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Merge branch 'stable-5.1'David Pursehouse2018-09-184-20/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: If6e4b4786401c6598b9f3b1c2b7d7081b08acd35 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | Merge branch 'stable-5.0' into stable-5.1David Pursehouse2018-09-184-20/+39
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: Ib7a63b5144a89c213aff3b32c30a2a6526355e64 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | | | | | Merge branch 'stable-4.11' into stable-5.0David Pursehouse2018-09-184-20/+39
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: Iffe202a412b3bca1c8d8d7dc5dfd646c49838de9 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | * | | | | Merge branch 'stable-4.10' into stable-4.11David Pursehouse2018-09-184-20/+39
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: I28ebf6138ccd9425fc05319de78c7716f0bdd199 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | * | | | Merge branch 'stable-4.9' into stable-4.10David Pursehouse2018-09-184-20/+39
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: Ib7d01cb0ece8b259156855045a53b8baf3fa2968 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | * | | Merge branch 'stable-4.8' into stable-4.9David Pursehouse2018-09-184-20/+39
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: Id8eb635094336567d9f3c28ec985cd5127d31632 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | * | Merge branch 'stable-4.7' into stable-4.8David Pursehouse2018-09-184-20/+39
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: Iad9836811be034cf992ea25dad4409addba75115 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | * Fix ObjectUploadListener#closeMatthias Sohn2018-09-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to set response status if response is already committed. Change-Id: I9a7c2871c86eb53416b905324775f3ed961c8ae6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * Fix error handling in FileLfsServletMatthias Sohn2018-09-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check in #sendError method if the response was committed already. If yes we cannot set response status or send an error message, last resort is to close the outputstream. If the response wasn't yet committed first reset the response before using writer to send the error message to the client since mixing STREAM and WRITE mode (mixing asynchronous and blocking I/O) is illegal in servlet 3.1. see the following bugs in the gerrit and jetty issue trackers https://bugs.chromium.org/p/gerrit/issues/detail?id=9667 https://bugs.chromium.org/p/gerrit/issues/detail?id=9721 https://github.com/eclipse/jetty.project/issues/2911 Change-Id: Ie35563c2e0ac1c5e918185a746622589a880dc7f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * ObjectDownloadListener#onWritePossible: Make code spec compatibleDavid Ostrovsky2018-09-171-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current code violates the ServletOutputStream contract. For every out.isReady() == true either write or close of that ServletOutputStream should be called. See also this issue upstream for more context: [1]. [1] https://github.com/eclipse/jetty.project/issues/2911 Change-Id: Ied575f3603a6be0d2dafc6c3329d685fc212c7a3 Signed-off-by: David Ostrovsky <david@ostrovsky.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * ObjectDownloadListener: Return from onWritePossible when data is writtenDavid Ostrovsky2018-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When buffer was written not only call AsyncContext#complete() but also return from the ObjectDownloadListener#onWritePossible(). This avoids endless loop after upgrading from Jetty 9.3.x to 9.4.x lines. In Jetty example implementation:[1] the return statemnt is also used: // If we are at EOF then complete   if (len < 0)   {    async.complete();     return;   } See also this issue upstream: [2]. [1] https://webtide.com/servlet-3-1-async-io-and-jetty [2] https://github.com/eclipse/jetty.project/issues/2911 Change-Id: Iac73fb25e67d40228a378a8e34103f1d28b72a76 Signed-off-by: David Ostrovsky <david@ostrovsky.org>
| | | | | | | * Fix IOException when LockToken#close failsMatthias Sohn2018-09-151-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened if the LockTokens hard link was already deleted earlier. Bug: 531759 Change-Id: Idc84bd695fac1a763b3cbb797c9c4c636a16e329 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | SmartOutputStream: Suppress false-positive resource leak warningDavid Pursehouse2018-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I013841ed2584f061c680a8adf0f777dcae3c5418 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | Set TagOpt.AUTO_FOLLOW when not cloning all branchesThomas Wolf2018-09-152-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise fetching all tags may pull in commits not on the specified branches. Canonical git also does this.[1] [1] https://github.com/git/git/blob/b160b6e69/builtin/clone.c#L1124 Bug: 538768 Change-Id: If0ac75fb9fae0c95d1a48b22954c54d4c3c09a47 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | Fix fetch refspecs when not cloning all branchesThomas Wolf2018-09-152-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When not all branches are cloned, the fetch refspec for the remote should not be "+refs/heads/*:refs/remotes/origin/*": that would fetch all branches on the very next fetch, thus making a clone with only a subset of the branches rather pointless. Instead, produce refspecs for the cloned branches only. Canonical git also does this for its --single-branch case; it doesn't have an option to clone only a subset of the branches (only one or all). Bug: 466858 Change-Id: Ie871880f757663437efac1e8b3313094f9e629b3 Also-by: Julian Enoch <julian.enoch@ericsson.com> Signed-off-by: Julian Enoch <julian.enoch@ericsson.com> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Move ls-refs parsing code to the ProtocolV2ParserIvan Frade2018-09-143-24/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch code has been moved to a ProtocolV2Parser, but ls-refs code is still in UploadPack. Moving it to the parser makes it easier to test, keeps the parsing together and makes the two commands follow similar structure. Change-Id: I573ce543e804ddeb9f83303b4af250b7cddc8cad Signed-off-by: Ivan Frade <ifrade@google.com>
* | | | | | | | Merge "Remove unused API problem filters"David Pursehouse2018-09-131-21/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused API problem filtersDavid Pursehouse2018-09-141-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac95de60df6f2928d491e952a531e8dfa90045f6 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | | Untangle UploadPack.processShallowIvan Frade2018-09-131-27/+32
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadPack.processShallow is doing too many things and offering a confusing API. It is filtering or splitting commit ids depending if a parameter is null and writing them out (or not) depending on another flag. Iterate the list and announce to Consumers what object ids need to be marked as (un)shallow. They decide what to do with them. As java consumers don't allow to propagate exceptions, define our own functional interface for it. Change-Id: I619cf2eed9b1e0338151120b8ef87a463fbe8827 Signed-off-by: Ivan Frade <ifrade@google.com>
* | | | | | | | UploadPack.fetchV2: Make shallow commits list non-nullableIvan Frade2018-09-131-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shallowCommits variable is nullable only to signal later if code has gone through the processShallow code. Use a flag to indicate that condition and make shallowCommits non-nullable. This makes code clearer and paves the way to untangle processShallow in a follow-up commit. Change-Id: I898e6aaf6f860bb6afafbac05653ba116c9b2da6 Signed-off-by: Ivan Frade <ifrade@google.com>
* | | | | | | | Merge branch 'stable-5.1'David Pursehouse2018-09-131-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Fix logging null if called process fails Change-Id: Iba771dd8d680b154cb628c7571a2bbc2ecf50a3b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | Fix logging null if called process failsCliffred van Velzen2018-09-121-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If some process executed by FS#readPipe ends in an error, the error stream is never set as errorMessage because FS#GobblerThread#waitForProcessCompletion always returned true. This caused LOG#warn to be called with null. Return false whenever FS#GobblerThread#waitForProcessCompletion fails. Bug: 538723 Change-Id: Ic9492bd688431d52c8665f7a2efec2989e95a4ce Signed-off-by: Cliffred van Velzen <cliffred@cliffred.nl> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | [spotBugs] Fix potential NPE in SmudgeFilter#downloadLfsResourceMatthias Sohn2018-09-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibaf8481a5b1a96ebe1debfd98e1e2201d1005fc0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Merge branch 'stable-5.1'Matthias Sohn2018-09-123-12/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Fix NoSuchFileException during directory cleanup in RefDirectory Update japicmp to 0.13.0 Prepare 5.1.1-SNAPSHOT builds JGit v5.1.0.201809111528-r Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Fix replacement quoting for replaceAll in filter command Prepare 4.11.3-SNAPSHOT builds JGit v4.11.2.201809100523-r Change-Id: Ia27fec6dabf87db26e2fd29c17570932649e234a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | Merge branch 'stable-5.0' into stable-5.1David Pursehouse2018-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Fix NoSuchFileException during directory cleanup in RefDirectory Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Change-Id: I9371f354d685545cc6a268420e44ae4c9577680f Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | | | | | Merge branch 'stable-4.11' into stable-5.0David Pursehouse2018-09-123-1/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Fix NoSuchFileException during directory cleanup in RefDirectory Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Change-Id: Ic7eaa0b6a4e750bc7853eb549a9e126269ae22cf Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | * | | | | Merge branch 'stable-4.10' into stable-4.11David Pursehouse2018-09-123-2/+5
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Fix NoSuchFileException during directory cleanup in RefDirectory Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Change-Id: I191d56e3c0f11cf53076b06c7e7a05492c7a03f1 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | * | | | Merge branch 'stable-4.9' into stable-4.10David Pursehouse2018-09-123-2/+5
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Fix NoSuchFileException during directory cleanup in RefDirectory Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Change-Id: Ied2d7a70c5544ff012687a1aeb6e07394d9bd6fd Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | * | | Merge branch 'stable-4.8' into stable-4.9David Pursehouse2018-09-123-2/+5
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Fix NoSuchFileException during directory cleanup in RefDirectory Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Change-Id: I5e6cc35f3673545e7ff857e6ed0bcd2c44e50316 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 16:23:33 +0000