Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-02-05ResolveMergerTest: Open Git in try-with-resourceDavid Pursehouse1-29/+30
Change-Id: Ic378ec25c4a3ea4354ee643029f87e46b6449ed4 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05RevCommitListTest: Open Git and RevWalk in try-with-resourceDavid Pursehouse1-17/+19
Change-Id: I4ba273a364a12f82a3b3b06ba050bc633411daf6 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05RevCommitParseTest: Open ObjectInserter.Formatter in try-with-resourceDavid Pursehouse1-2/+3
Change-Id: Iaa87c51bc19b4fa832393c11db20b69865d30d48 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05RevObjectTest: Open RevWalk in try-with-resourceDavid Pursehouse1-3/+6
Change-Id: I19bcbb2f12036c5043436f3d544ccefbb7385b8d Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05RevTagParseTest: Open ObjectInserter.Formatter in try-with-resourceDavid Pursehouse1-3/+4
Change-Id: I2341977223be1dc5252492f4775626122f56496b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05RevertCommandTest: Open Git in try-with-resourceDavid Pursehouse1-237/+243
Change-Id: I659adbb0a6f741c4c6f615c8a24b4603c3f6681e Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05SquashMessageFormatterTest: Open git in try-with-resourceDavid Pursehouse1-11/+12
Change-Id: Ife94d1f0279ed3671a9bca79fb26c0403549fa17 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05StatusCommandTest: Open Git in try-with-resourceDavid Pursehouse1-94/+96
Change-Id: Id13ad9fa3157d0479da12fb8184437be3ca8c948 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05SubmoduleAddTest: Open Git in try-with-resourceDavid Pursehouse1-87/+91
Change-Id: I1276ce206e891729adfa681e00952ca0ba6ffc53 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05SymlinksTest: Open git and TreeWalk in try-with-resourceDavid Pursehouse1-164/+173
Change-Id: I0fd1933e843375029fa795447b688f23a893f84b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05T0003_BasicTest: Open autocloseable types in try-with-resourceDavid Pursehouse1-11/+11
FileRepository and ObjectInserter.Formatter are autocloseable, so use try-with-resource for these. Remove suppression of unused variable warning that is no longer necessary. Change-Id: I270829f0a4030083c9599eb5785b0145dc590ed8 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05TextHashFunctions: Fix warnings about variable hidingDavid Pursehouse1-7/+7
The local variables/arguments named 'db' were hiding the member variable of the same name in the superclass TextBuiltin. Change-Id: Ic49dcb7cc2a1b3fb46ad78450042c8c8fb464a80 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05TreeFilterTest: Open TreeWalk in try-with-resourceDavid Pursehouse1-9/+12
Change-Id: If100a66e544926bcffe9a9a0b31bfd4806902864 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-05TreeWalkJava7Test: Open TreeWalk in try-with-resourceDavid Pursehouse1-8/+9
Change-Id: I99a483c482b5395653b0d57b368ec1b5fdba450c Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-04Fix diff for added and removed submoduleHugo Arès2-0/+65
Since If13f7b406, submodule difference are shown as a hunk. The issue was that added and removed submodule were considered as Edit.REPLACE instead of Edit.INSERT and Edit.DELETE in the DiffFormatter result. Change-Id: I4330c2aa3f10e29d7d6b0b2e5286e59293a06239 Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
2016-02-02DirCacheCheckoutTest: Open Git and TreeWalk in try-with-resourceDavid Pursehouse1-106/+109
Change-Id: Icc8eda841e6a437e1acf3438525014e7c46d5eb2 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-02CommitCommand: Remove declaration of unthrown exceptionDavid Pursehouse1-1/+1
Change-Id: I1795b1e510ab170f062ee6c5988d7a7567abe260 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-02Branch: Fix variable hiding warningDavid Pursehouse1-8/+8
The Branch class has a member named 'branch', which was being hidden by the local variable of the same name used in a for-loop. Change-Id: I334092010a9c80686fb79713852d4bfa166ce12f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-02ApplyCommandTest: Open Git in try-with-resourceDavid Pursehouse1-16/+17
Also, add missing braces around if-block. Change-Id: I9390b2c7d5c4507923b6f06271a070dc868534e5 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-02-02PackFileTest: Open ObjectInserter.Formatter in try-with-resourceDavid Pursehouse1-109/+112
Change-Id: I9c56b5efdb9c13b929073a786092a707fca21281 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-26FileTreeIteratorTest: Open Git and RevWalk in try-with-resourceDavid Pursehouse1-195/+204
Change-Id: I6e68c4b028e0aa01964eace10307372060371df7 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-25RebaseCommandTest: Open RevWalk in try-with-resourceDavid Pursehouse1-178/+200
Change-Id: If7b7a90171d1349d634a84f135471ebac29e3210 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-25PullCommandTest: Open RevWalk in try-with-resourceDavid Pursehouse1-15/+18
Change-Id: I676cd7ef4bb29f980a313acd77506dd070e6c98f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-25BlameGeneratorTest: Create Git instances in try-with-resourceDavid Pursehouse1-118/+119
Change-Id: I2dc4191603fbd6c3214763b869882c51b0e53284 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-25Remove unnecessary suppression of deprecation warnings in testsDavid Pursehouse3-3/+0
Change-Id: I722f8c2e80129e0129349b55a53b29626e2af21c Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-25DiffEntryTest: Open Git and TreeWalk in try-with-resourceDavid Pursehouse1-261/+272
Change-Id: If4a49268b9b7ec3a44ed1508ed78db365b0c9e5b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-25DiffCommandTest: Open Git and RevWalk in try-with-resourceDavid Pursehouse1-139/+144
Change-Id: I966f7e5053651661abc7de63c968e1f5bf2de464 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-25CommitCommandTest: Open Git and TreeWalk in try-with-resourceDavid Pursehouse1-260/+266
Change-Id: I65a6fd7028e209c300d992c2756100c09ab4dc19 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-24Merge changes Ifdb33501,Idc7b7bbd,Ia3db8696,I4ef82311,I3ad58d4c, ... into ↵Matthias Sohn5-73/+82
stable-4.2 * changes: ConcurrentRepackTest: Don't use deprecated WindowCache.reconfigure ConcurrentRepackTest: Open RevWalk in try-with-resource CommitOnlyTest: Open RevWalk in try-with-resource UnpackedObjectTest: Create ObjectInserter.Formatter in try-with-resource FileRepositoryBuilderTest: Use try-with-resource for auto-closeables RepositorySetupWorkDirTest: Fix "resource leak" warnings
2016-01-22ConcurrentRepackTest: Don't use deprecated WindowCache.reconfigureDavid Pursehouse1-4/+3
Replace with calls to WindowCacheConfig.install() as mentioned in WindowCache.reconfigure's deprecation notice. Change-Id: Ifdb33501a2209239029c815b1e4e844ea5b56075 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-22ConcurrentRepackTest: Open RevWalk in try-with-resourceDavid Pursehouse1-3/+6
Change-Id: Idc7b7bbdc1df05372b873cbe4c495474f3ffd64b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-22CommitOnlyTest: Open RevWalk in try-with-resourceDavid Pursehouse1-4/+6
Change-Id: Ia3db8696f66f8d294e1d443fb54e716d26d517b1 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-22UnpackedObjectTest: Create ObjectInserter.Formatter in try-with-resourceDavid Pursehouse1-5/+11
The ObjectInserter.Formatter instance is only used to call idFor. Factor out a utility method to do that. Change-Id: I4ef823110c2152ac7905681df3217eb8001f5bd9 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-22FileRepositoryBuilderTest: Use try-with-resource for auto-closeablesDavid Pursehouse1-48/+46
Use try-with-resource to create instances of FileRepository and FileWriter. "resource" and "unused" warnings no longer occur, so remove the suppression annotations. Change-Id: I3ad58d4cc2d4c019cd8edda7cb401e9d9f3fb790 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-22RepositorySetupWorkDirTest: Fix "resource leak" warningsDavid Pursehouse1-9/+10
Use FileRepositoryBuilder to create the Repository, except in cases where the creation was already in a try-block. Convert those to use a try-with-resource. Change-Id: I7d7adeee81bda6e80d91a119c7d690de3d00dc2b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-22Remove java7 bundle from Maven central scriptsMatthias Sohn2-2/+0
The bundle org.eclipse.jgit.java7 was deleted in 4.0 Change-Id: I57dbc0b18eaf164c8f53cc2b776ecb80481a993d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-01-22Prepare 4.2.1-SNAPSHOT buildsMatthias Sohn46-255/+255
Change-Id: Ic9eac53b10ac97b2038b334d388ae3d21393f993 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-01-21JGit v4.2.0.201601211800-rv4.2.0.201601211800-rMatthias Sohn46-49/+49
Change-Id: I89f33b0da81ff499315baa5311f95f31724fa510 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-01-21Add progress monitor to MergerLaurent Delaigue5-0/+58
Monitoring progress of merges can be useful for users for large repositories or complex merge processes that take some time. This enables setting a monitor. Existing merge implementations in jgit do not yet report progress if a monitor is set. This will be added in a later change. Change-Id: I17b978b3fc91750dd88649638b90a46820a0877c Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-01-21Fix TransportException when reading bundleChris Gavin1-10/+17
When reading a bundle file, commit messages who's oneline format is longer than 982 characters caused JGit to treat subsequent text in the commit as a SHA, then throw a TransportException because it's not a valid SHA. Now the readLine method will read all the way to the end of the line, not just the first 1024 characters of it. Change-Id: If15b491aa9a1e4fd9b8bbed2dd9e6be47a64ccb7 Signed-off-by: Chris Gavin <chris@chrisgavin.me>
2016-01-21Fix unused throws CorruptObjectException from addTreeShawn Pearce2-4/+2
2262a794b48ea removed throws CorruptObjectException, but was not compiled under Eclipse and did not see errors generated by Eclipse. Maven build silently ignored the unnecessary code. Change-Id: I6e9014adcc604588e10e5963d13d0c6ef0e1c617
2016-01-21Merge branch 'master' into stable-4.2Matthias Sohn195-3891/+9433
Change-Id: Ieec4f51aedadf5734ae0e3f4e8713248a3c4fc52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-01-21BundleWriterTest: Open RevWalk in try-with-resourceDavid Pursehouse1-18/+20
Change-Id: Ie25770a73b19d6522bad9fdc0966f48370f96265 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-21DiffFormatterTest: Remove accidentally added trailing whitespaceDavid Pursehouse1-2/+2
Change-Id: Ia7a3b05b79c3a5530a4445e6e48ceae445425224 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-21CherryPickCommandTest: Create Git instances in try-with-resourceDavid Pursehouse1-191/+197
Change-Id: I9d49258bdf12f3221013c37cfb8a21ea27f28860 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-21DiffFormatterTest: Create auto-closeable instances in try-with-resourceDavid Pursehouse1-78/+82
Git, ByteArrayOutputStream, and DiffFormatter are auto-closeable and should be managed in try-with-resource. Change-Id: I83395116acb4b4f7cd4300fd69564355bc07e4bb Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-21ConfigTest: Create Git instance in try-with-resourceDavid Pursehouse1-1/+3
Change-Id: Ie65c69e0f1aed95bcdf68ebd68d21b3e2590b41c Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-21CommitAndLogCommandTest: Use assumeFalse to skip test on WindowsDavid Pursehouse1-2/+2
Use JUnit's assumeFalse method to cause the test to skip when run on Windows. Change-Id: I3f59440cfe62c37c127e381052b60471fbe8ec5e Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-21CommitAndLogCommandTest: Create Git instances in try-with-resourceDavid Pursehouse1-250/+256
Change-Id: Id06417f1d3914cd3addacdbe9b5801a06cc3955f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
2016-01-21AddCommandTest: Create Git instances in try-with-resourceDavid Pursehouse1-306/+327
Change-Id: Idf42f03099eeb9975fef9492ea8a75776afc2a3c Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>

Back to the top