aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-5.3'Matthias Sohn2019-03-070-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.3: Prepare 5.3.0-SNAPSHOT builds JGit v5.3.0.201903061415-rc1 Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository ObjectDirectory: extra logging on packfile exceptions Change-Id: I8c7dfd5141be0d27547d65f19054f9a1665b55fb
| * Prepare 5.3.0-SNAPSHOT buildsMatthias Sohn2019-03-0668-89/+89
| | | | | | | | | | Change-Id: I9b934bcfad3d2091f4da163170348b0c8ef5e732 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v5.3.0.201903061415-rc1v5.3.0.201903061415-rc1Matthias Sohn2019-03-0668-89/+89
| | | | | | | | | | Change-Id: I85866af97fe1c0c0a0da83a7605484082fa56b52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'master' into stable-5.3Matthias Sohn2019-03-06126-1707/+2825
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update Orbit to R20190226160451 Upgrade maven-javadoc-plugin to 3.1.0 diff: add option metaVar for --src-prefix and --dst-prefix ResolveMerger: Destroy TemporaryBuffer on unchecked exceptions Expose the filter blob limit in UploadPack Upgrade error_prone_core to 2.3.3 On Windows use %APPDATA%\gnupg as GPG directory if it exists Remove duplicate externalized message RebaseCommand: tighten check for --preserve-merges on --continue RebaseCommand: fix ONTO_NAME, and --preserve-merges is interactive RebaseCommand: use orig-head to abort Fix core.autocrlf for non-normalized index RebaseCommand: use orig-head in addition to head SHA1: Use externalized message in log JGitText: Remove unnecessary suffix from externalized message identifier FS_POSIX: Externalize log message Strongly reference indices in DfsPackFile Update Orbit to S20190219190953 Update README Update README Add missing @since tag for new API method getUpdateIndex Fix NPE in PlotCommitList CommitBuilder: Deprecate setEncoding(String) CommitBuilder: Add missing periods on methods' Javadoc Upgrade wagon-ssh to 3.3.2 Fix bug in copyPackBypassCache's skip 'PACK' header logic Upgrade spotbugs to 3.1.11 Atomic file creation: hard-linking may not be allowed Update Orbit to S20190129210011 Fix GC.deleteEmptyRefsFolders Enable cloning only specific tags Delete jgit-4.5 target platform Add 4.11-staging target platform and update Orbit to I20190123233226 Upgrade jacoco-maven-plugin to 0.8.3 Bazel: Format BUILD file with buildifier RenameBranchCommand: more consistent handling of short ref names SshdSessionFactory: generalize providing default keys Allow to check for signing key Handle premature EOF in BundleFetchConnection pgm: Fix missing braces in Version.run() pgm: Handle IOException in Version command pgm: Fix missing braces in UploadPack.run() pgm: Handle IOException in UploadPack command pgm: Handle exceptions in Tag command pgm: Fix missing braces in Status.run() pgm: Handle exceptions in Status command pgm: Fix missing braces in ShowRef.run() pgm: Handle IOException in ShowRef command pgm: Fix missing braces in Show.run() pgm: Handle exceptions in Show command pgm: Fix missing braces in Rm command pgm: Handle GitAPIException in Rm command pgm: Handle exceptions in RevParse command pgm: Externalize error message pgm: Fix missing braces in Reset.run() pgm: Handle GitAPIException in Reset command pgm: Handle GitAPIException in Repo command pgm: Handle exceptions in Remote command pgm: Handle exceptions in Reflog command pgm: Handle IOException in ReceivePack command SmartClientSmartServerTest: Open Repository in try-with-resource SmartClientSmartServerTest: Open ObjectInserter.Formatter in try-with-resource SmartClientSmartServerTest#addBrokenContext: Remove unused TestRepository IO: Open TemporaryBuffer.Heap in try-with-resource GitSmartHttpTools: Open SideBandOutputStream in try-with-resource TemporaryBufferTest: Open TemporaryBuffer in try-with-resource Scanner: Open RevWalk in try-with-resource SubmoduleWalkTest: Open Repository in try-with-resource SideBandOutputStreamTest: Open SideBandOutputStream in try-with-resource UnionInputStreamTest: Open UnionInputStream in try-with-resource Merge: Avoid non-localised literal string warning for "recursive" pgm: Fix missing braces in Push.run() pgm: Handle exceptions in Push command pgm: Fix missing braces in MergeBase.run() pgm: Handle IOException in MergeBase command pgm: Fix missing braces in Merge command pgm: Handle exceptions in Merge command pgm: Fix missing braces in LsTree.run() pgm: Handle exceptions in LsTree command pgm: Fix missing braces in LsRemote.run() pgm: Handle exceptions in LsRemote command pgm: Handle exceptions in LsFiles command pgm: Fix missing braces in Log.run() pgm: Handle exceptions in Log command pgm: Handle exceptions in Init command pgm: Handle IOException in IndexPack command pgm: Fix missing braces in Fetch.run() pgm: Handle IOException in Fetch command pgm: Handle GitAPIException in Gc command pgm: Fix missing braces in DiffTree.run() pgm: Handle exceptions in DiffTree command pgm: Fix missing braces in Diff.run() pgm: Handle exceptions in Diff command RawParseUtils: Avoid import of java.nio.charset.StandardCharsets Consistently import constants from StandardCharsets as static LocalDiskRepositoryTestCase#createRepository: Default auto-close to false UploadPack: Suppress false-positive resource leak warning PushConnectionTest: Open TestRepository in try-with-resource MergerTest: Open TestRepository in try-with-resource MergeCommandTest: Open TestRepository in try-with-resource PackWriterTest: Open TestRepository in try-with-resource ReceivePackAdvertiseRefsHookTest: Open TestRepository in try-with-resource SubmoduleStatusTest: Open TestRepository in try-with-resource UploadPackTest: Open TestRepository in try-with-resource PackParserTest: Open TestRepository in try-with-resource SmartClientSmartServerTest: Open TestRepository in try-with-resource Stop using deprecated methods of RemoteSetUrlCommand/RemoteRemoveCommand SmartClientSmartServerTest: Stop using deprecated Repository#hasObject DumbClientSmartServerTest: Open TestRepository in try-with-resource DumbClientDumbServerTest: Open TestRepository in try-with-resource DirCacheCheckoutTest: Open TestRepository in try-with-resource HttpTestCase#fsck: Open TestRepository in try-with-resource CheckoutCommandTest: Add comment to document intentionally empty catch block pgm: Fix missing braces in Describe.run() pgm: Handle exceptions in Describe command pgm: Handle exceptions in Config command pgm: Fix too wide lines in Commit.run() pgm: Fix missing braces in Commit.run() pgm: Handle exceptions in Commit command pgm: Handle exceptions in Clean command pgm: Handle GitAPIException in Fetch command Fix missing braces in Branch.run() pgm: Handle exceptions in Branch command Fix missing braces in Blame.run() pgm: Handle NoWorkTreeException and IOException in Blame command Use try-with-resource for reader in Blame.run() pgm: Handle GitAPIException in Add command Change-Id: I6d546885beb9596120e201973995a7c6bfe115e0
| * \ Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2019-03-066-12/+71
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository ObjectDirectory: extra logging on packfile exceptions Change-Id: I81cf1cdc9d8dcd54536a79e522274fd244fa1d00
| | * \ Merge branch 'stable-5.1' into stable-5.2David Pursehouse2019-03-060-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository ObjectDirectory: extra logging on packfile exceptions Change-Id: Id9f957ca8386f6035f4ab34d242cb6fb8c38e012 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | * \ Merge branch 'stable-5.0' into stable-5.1David Pursehouse2019-03-060-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository ObjectDirectory: extra logging on packfile exceptions Change-Id: I056f41f619a1bb22ca6be75ec21c32c1f6d4fd2f Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | * \ Merge branch 'stable-4.11' into stable-5.0David Pursehouse2019-03-067-11/+74
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository ObjectDirectory: extra logging on packfile exceptions Change-Id: If75b149e693005dd3fe06b523e6e6784bedf44c1 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | * \ Merge branch 'stable-4.10' into stable-4.11David Pursehouse2019-03-067-11/+74
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository ObjectDirectory: extra logging on packfile exceptions Change-Id: I9052e318b5d920770f7c7121d36e3c58df9d5f5a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | * \ Merge branch 'stable-4.9' into stable-4.10David Pursehouse2019-03-067-11/+74
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository ObjectDirectory: extra logging on packfile exceptions Change-Id: I0847251eb010616a705e0b91df4bdebc225fa95d Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | * | Fix error log message in ObjectDirectory.handlePackError()Matthias Sohn2019-03-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I154f392ad025c4b642eb1123d375a0afaa853885 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit 997d785418d55dce5a1188fdb95e6d2b4ab0bde5)
| | | | | | | * | Properly format pack checksums in PackFile.idx()Matthias Sohn2019-03-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id805850dbe9a3d633168f3056e06ddeafd86f961 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit a33e4dc58a87daf34072b82643aba0fd4456c165)
| | | | | | | * | Cancel gc if thread was interruptedMatthias Sohn2019-03-062-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see https://groups.google.com/d/msg/repo-discuss/oDB2rl3doDc/tFEh5Xt0CAAJ Change-Id: Ia6d4631c64e065d8b9b09e0b45e7a9ea8ac3f41d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit 882fed0d96c533513c43ae77aaff9cc07b94012c)
| | | | | | | * | PackFile: report correct message for checksum mismatchLuca Milanesio2019-03-062-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the packfile checksum does not match the expected one report the correct checksum error instead of reporting that the number of objects is incorrect. Change-Id: I040f36dacc4152ae05453e7acbf8dfccceb46e0d Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit 436c99ce5946f31f06b8704b1fd33136f39dc814)
| | | | | | | * | ObjectDirectory: Clean up loggingDavid Pursehouse2019-03-063-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize the message and log the pack file with absolute path. Change-Id: I019052dfae8fd96ab67da08b3287d699287004cb Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> (cherry picked from commit 9665d86ba1dd2937ca26f6aba63bb16aa277f888)
| | | | | | | * | Bazel: Stop using native.git_repositoryDavid Pursehouse2019-03-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native.git_repository method doesn't work in the latest version of bazel, and causes the build to fail with: type 'struct' has no method git_repository() Change-Id: Id6a57369b681c0afe811e9e3740b141fb7fb4653 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> (cherry picked from commit ec5fc57b791081fa073fc5fd91286347238f8f7c)
| | | | | | | * | ObjectDirectory: extra logging on packfile exceptionsLuca Milanesio2019-03-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display extra logging, including the exception with the associated stacktrace, whenever a packFile can't be read and thus removed from the packlist. Change-Id: I97a4e31dc427bfcc0baae438dcbe2dcd4704b824 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com> (cherry picked from commit 962babc4b27ffd90058fe7734f17ed1c4e77d958)
* | | | | | | | | Track object inflation time in DfsReaderIoStatsTerry Parker2019-03-062-0/+14
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can help track down poor long tail performance that isn't accounted for in the readIdxMicros or readBlockMicros metrics. Change-Id: I701b9cfcc124f4ddb860d1766a11ea3557e604ce Signed-off-by: Terry Parker <tparker@google.com>
* | | | | | | | Update Orbit to R20190226160451Matthias Sohn2019-03-0613-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I43bfd56b029b4bf16aaf001915a9dabeb189a9e2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Merge "Upgrade maven-javadoc-plugin to 3.1.0"Matthias Sohn2019-03-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgrade maven-javadoc-plugin to 3.1.0David Pursehouse2019-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4fc59b02e92db55797b9773648fd1dea88682ade Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | | Merge "Merge branch 'stable-5.2'"Matthias Sohn2019-03-056-12/+71
|\| | | | | | | |
| * | | | | | | | Merge branch 'stable-5.2'David Pursehouse2019-03-056-12/+71
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository Change-Id: Ib972641105cef8089791fc65389c4f43e218620a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | | | | | | Merge branch 'stable-5.1' into stable-5.2David Pursehouse2019-03-056-12/+71
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository Change-Id: I42b72a3bba3b4c9389d91a1a35a8004836567e7c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | * | | | | | Fix error log message in ObjectDirectory.handlePackError()Matthias Sohn2019-03-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I154f392ad025c4b642eb1123d375a0afaa853885 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | | Properly format pack checksums in PackFile.idx()Matthias Sohn2019-03-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id805850dbe9a3d633168f3056e06ddeafd86f961 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | | Cancel gc if thread was interruptedMatthias Sohn2019-03-032-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see https://groups.google.com/d/msg/repo-discuss/oDB2rl3doDc/tFEh5Xt0CAAJ Change-Id: Ia6d4631c64e065d8b9b09e0b45e7a9ea8ac3f41d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | | PackFile: report correct message for checksum mismatchLuca Milanesio2019-03-032-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the packfile checksum does not match the expected one report the correct checksum error instead of reporting that the number of objects is incorrect. Change-Id: I040f36dacc4152ae05453e7acbf8dfccceb46e0d Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | | ObjectDirectory: Clean up loggingDavid Pursehouse2019-03-033-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize the message and log the pack file with absolute path. Change-Id: I019052dfae8fd96ab67da08b3287d699287004cb Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | * | | | | | Bazel: Stop using native.git_repositoryDavid Pursehouse2019-03-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native.git_repository method doesn't work in the latest version of bazel, and causes the build to fail with: type 'struct' has no method git_repository() Change-Id: Id6a57369b681c0afe811e9e3740b141fb7fb4653 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | | Merge "diff: add option metaVar for --src-prefix and --dst-prefix"Christian Halstrick2019-03-052-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | diff: add option metaVar for --src-prefix and --dst-prefixAndre Bossert2019-03-042-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes exception if using "jgit diff --help". Bug: 544735 Change-Id: I694ff3103da4bc199dd03c40962c5be191eddcd1 Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
* | | | | | | | | ResolveMerger: Destroy TemporaryBuffer on unchecked exceptionsDave Borowitz2019-03-011-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called destroy() to delete the temp file on failure only when catching an IOException, not a RuntimeException. Use a slightly different construction with a finally block to ensure it's always deleted on error (assuming the JVM is still healthy enough). Change-Id: Ie201f3cfc81099ee1cafed066632da76223cef1f
* | | | | | | | | Expose the filter blob limit in UploadPackTerry Parker2019-02-281-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to UploadPack.getDepth() to know the shallow clone depth, expose the user-specified filter blob limit for partial clones. Change-Id: I04bde06862a1cf8a9862d950c15023c49d16a2a6 Signed-off-by: Terry Parker <tparker@google.com>
* | | | | | | | | Upgrade error_prone_core to 2.3.3David Pursehouse2019-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31232d09b6dc1e5bb3d3398d34b3dd814165d2dc Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | | Merge changes from topic 'rebase_compatibility'Thomas Wolf2019-02-261-4/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: RebaseCommand: tighten check for --preserve-merges on --continue RebaseCommand: use orig-head to abort RebaseCommand: use orig-head in addition to head
| * | | | | | | | | RebaseCommand: tighten check for --preserve-merges on --continueThomas Wolf2019-02-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With native git, .git/rebase-merge/rewritten exists actually in two different cases: * as a file in git rebase --merge recording OIDs for copying notes * as a directory in git rebase --preserve-merges Add a comment, and check for isDirectory() instead of exists(). Bug: 511487 Change-Id: I6a3317b4234d4f41c41b3004cdc7ea0abf2c6223 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | | | | | | | RebaseCommand: use orig-head to abortThomas Wolf2019-02-261-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aborting a rebase used ORIG_HEAD to reset. Strictly speaking this is not correct, since other commands run during the rebase (for instance, when the rebase stopped on a conflict) might have changed ORIG_HEAD. Prefer the OID recorded in the orig-head file, falling back to the older "head" file if "orig-head" doesn't exist, and use ORIG_HEAD only if neither exists. Bug: 511487 Change-Id: Ifa99221bb33e4e4754377f9b8f46e76c8936e072 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | | | | | | | RebaseCommand: use orig-head in addition to headThomas Wolf2019-02-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 2011-02-10 (i.e., git 1.7.6)[1] native git uses "orig-head" for REBASE_HEAD. JGit was still using "head". Currently native git has a legacy fall-back for reading this, but for how long? Let's write to both. Note that JGit never reads this file. [1] https://github.com/git/git/commit/84df4560 Bug: 511487 Change-Id: Id3742bf9bbc0001d850e801b26cc8880e646abfc Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | | Merge "Strongly reference indices in DfsPackFile"Jonathan Nieder2019-02-261-128/+113
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Strongly reference indices in DfsPackFileMinh Thai2019-02-211-128/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DfsBlockCache.Ref might get cleared out if the JVM is running out of memory. As a result, the index is not persisted for the request and will be reloaded unnecessarily. Change-Id: I3b57ad5e6673f77f2dc66177a649ac412a97fe20 Signed-off-by: Minh Thai <mthai@google.com>
* | | | | | | | | | | Merge "On Windows use %APPDATA%\gnupg as GPG directory if it exists"Gunnar Wagenknecht2019-02-261-6/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | On Windows use %APPDATA%\gnupg as GPG directory if it existsThomas Wolf2019-02-261-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hard-coding ~/.gnupg for the GPG directory doesn't work on Windows, where GnuPG uses %APPDATA%\gnupg by default. Make the determination of the directory platform-dependent. Bug: 544797 Change-Id: Id4bfd39a981ef7c5b39fbde46fce9a7524418709 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | | | | Merge "Remove duplicate externalized message"Christian Halstrick2019-02-263-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove duplicate externalized messageThomas Wolf2019-02-263-4/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of a new "unexpectedNlinkValue" message use the already existing "failedAtomicFileCreation". Remove a stray double quote from the latter. Change-Id: I1ba5e9ea48d3f7615354b2ace2575883070b3206 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | | | RebaseCommand: fix ONTO_NAME, and --preserve-merges is interactiveThomas Wolf2019-02-261-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ONTO_NAME must be "onto_name", not "onto-name". For native git, --preserve-merges is an interactive mode. Create the INTERACTIVE marker file, otherwise a native git rebase --continue will fall back into rebase --merge mode before git 2.19.0 since it started looking for the REWRITTEN directory to make the distinction only then.[1] This allows a JGit interactive rebase to be continued via native git rebase --continue. [1] https://github.com/git/git/commit/6d98d0c0 Bug: 511487 Change-Id: I13850e0fd96ac77d03fbb581c8790d76648dbbc6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | | | Fix core.autocrlf for non-normalized indexThomas Wolf2019-02-267-11/+282
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With text=auto or core.autocrlf=true, git does not normalize upon check-in if the file in the index contains already CR/LFs. The documentation says: "When text is set to "auto", the path is marked for automatic end-of-line conversion. If Git decides that the content is text, its line endings are converted to LF on checkin. When the file has been committed with CRLF, no conversion is done."[1] Implement the last bit as in canonical git: check the blob in the index for CR/LFs. For very large files, we check only the first 8000 bytes, like RawText.isBinary() and AutoLFInputStream do. In Auto(CR)LFInputStream, ensure that the buffer is filled as much as possible for the isBinary() check. Regarding these content checks, there are a number of inconsistencies: * Canonical git considers files containing lone CRs as binary. * RawText checks the first 8000 bytes. * Auto(CR)LFInputStream checks the first 8096 (not 8192!) bytes. None of these are changed with this commit. It appears that canonical git will check the whole blob, not just the first 8k bytes. Also note: the check for CR/LF text won't work with LFS (neither in JGit nor in git) since the blob data is not run through the smudge filter. C.f. [2]. Two tests in AddCommandTest actually tested that normalization was done even if the file was already committed with CR/LF.These tests had to be adapted. I find the git documentation unclear about the case where core.autocrlf=input, but from [3] it looks as if this non-normalization also applies in this case. Add new tests in CommitCommandTest testing this for the case where the index entry is for a merge conflict. In this case, canonical git uses the "ours" version.[4] Do the same. [1] https://git-scm.com/docs/gitattributes [2] https://github.com/git/git/blob/3434569fc/convert.c#L225 [3] https://github.com/git/git/blob/3434569fc/convert.c#L529 [4] https://github.com/git/git/blob/f2b6aa98b/read-cache.c#L3281 Bug: 470643 Change-Id: Ie7310539fbe6c737d78b1dcc29e34735d4616b88 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | | SHA1: Use externalized message in logDavid Pursehouse2019-02-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-externalized warning message says there is a "possible SHA-1 collision" but then the Sha1CollisionException is always thrown. Replace the message with the existing externalised string that does not say "possible". Change-Id: I9773ec76b416c356e234a658fb119f98d33eac83 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | | | JGitText: Remove unnecessary suffix from externalized message identifierDavid Pursehouse2019-02-253-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a3ade56c219826b81d33d1d52566a86ad2e853a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | | | FS_POSIX: Externalize log messageDavid Pursehouse2019-02-253-2/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ida538e05c4595fdce99f1fa87469a3be60160adb Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-08 10:47:32 +0000