summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "AbstractTreeIterator: Add toString with entry path"Christian Halstrick2012-10-221-0/+5
|\
| * AbstractTreeIterator: Add toString with entry pathRobin Stocker2012-10-201-0/+5
| | | | | | | | | | | | Helps when debugging tree walking code. Change-Id: I7ba3846a028a1538787a7d4fbf50f7c487cae6c7
* | StashCreateCommand: Abort in case of unmerged pathsRobin Stocker2012-10-224-0/+61
|/ | | | | Bug: 391861 Change-Id: I5f8ffe072c08c8ca2ca6be6b6afa67c8e16a63b6
* Update packaging build to use Tycho 0.16Matthias Sohn2012-10-191-1/+1
| | | | Change-Id: Ie5c2f9d4a3b64fc43d310bec45685970cb227237 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Update jgit's last release version for API change reportsMatthias Sohn2012-10-161-1/+1
| | | | Change-Id: I04b1e8a2d3aa49c45bd7846fa87b9acfa57f8fda Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "Add a hint on the purpose of JGitInternalException to the constructor"Christian Halstrick2012-10-141-0/+4
|\
| * Add a hint on the purpose of JGitInternalException to the constructorRobin Rosenberg2012-10-141-0/+4
| | | | | | | | | | | | | | | | In code review we often see uses of JGitInternalException where a high level GitAPIException would be more appropriate. Hopefully the word low-level in the constructor comment will lead to fewer such cases. Change-Id: Id5ec7897535f6c5c5f0bd153fe0ff15c65083474
* | RevWalk: Add link to parseHeaders/parseBody in Javadoc of lookupCommitRobin Stocker2012-10-131-0/+3
| | | | | | | | Change-Id: I7765d1a69d19968ebad603025a9c686f17633ebd
* | Merge "Make BlameGenerator comments more clear"Matthias Sohn2012-10-091-4/+6
|\ \
| * | Make BlameGenerator comments more clearPatrick Carlson2012-08-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The file location of the constructor for BlameGenerator did not specify where the path should be relative from. Fix BlameGenerator comments based on suggestions by Robin Stocker. Change-Id: I3d79db2d2ba4961835fe664ae6178e0bfc97b910
* | | CommitCommand: Use original author on amend if author is not setRobin Stocker2012-10-082-3/+51
| | | | | | | | | | | | | | | | | | | | | This way, callers don't have to parse author ident of HEAD themselves. Bug: 362391 Change-Id: I383a817e6ed4707d637c52c007bc7b57728e6c85
* | | CommitCommand: Don't allow amending on initial commitRobin Stocker2012-10-084-0/+13
| |/ |/| | | | | Change-Id: I27b13510eb6756da21d0d359d76031da4a875e28
* | Merge "Add --squash option to org.eclipse.jgit.pgm.Merge"Matthias Sohn2012-10-074-14/+57
|\ \
| * | Add --squash option to org.eclipse.jgit.pgm.MergeTomasz Zarna2012-10-074-14/+57
| | | | | | | | | | | | Change-Id: Ifd20b6f4731cfa71319145cac7b464aa53db18b8
* | | Fix unstable testRobin Rosenberg2012-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add more time to a timestamp to safely go beyond the granularity of the timestamp resolution of the file system. The lowest resolution we know of is FAT with two second resolution. Then add some to make sure we are above the limit. Change-Id: I85c5b07dcdf2d80de41fe9b2354ccc888bad7f1e
* | | Update READMERobin Stocker2012-09-281-32/+31
|/ / | | | | | | | | | | Extend introduction, update links and remove outdated information. Change-Id: I29f4d72c980008b6bebe3b009d58c915cd091b9d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix compile error (method not available in 1.5)Markus Keller2012-09-271-1/+1
| | | | | | | | | | Change-Id: I07aca821010daca75a66506b9ca738bc8c262abb Signed-off-by: Markus Keller <markus_keller@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Remove unused import introduced with 8f706db5"Robin Rosenberg2012-09-261-2/+2
|\ \
| * | Remove unused import introduced with 8f706db5Matthias Sohn2012-09-251-2/+2
| | | | | | | | | | | | | | | | | | Also cleanup wildcards in import statements. Change-Id: I28c1435ae7482de1209aeefc755a230ef5b8c15d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Revert "The constructor CmdLineException(String) is deprecated"Shawn O. Pearce2012-09-266-36/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 07f99362575f324e466d7f5ae49d5f8f69cf7a8a. 07f9 seems to require a more recent args4j, but I cannot locate a CQ that verifies we can use a version more recent then 2.0.12. 2.0.16 has been released, but the Hudson CI instance at Eclipse won't build it. Since the commit fixes an issue identified in March but wasn't actually submitted to the tree until September, we can continue to ignore whatever the problem is/was until someone can attempt a more correctly working solution. Change-Id: I94fa432c219bda21c1126976bb60e5292760092e
* | Merge "Provide a convenient read() in RepositoryTestCase"Christian Halstrick2012-09-253-13/+27
|\ \
| * | Provide a convenient read() in RepositoryTestCaseRobin Stocker2012-09-253-13/+27
| | | | | | | | | | | | | | | | | | | | | For reading a file by its repository-relative path, analogous to writeTrashFile. Change-Id: I112de0d57c2ee1bd425de6cbf561a57fea7147f0
* | | Merge "Add the intended file to avoid breakage"Christian Halstrick2012-09-251-1/+1
|\ \ \ | |/ / |/| |
| * | Add the intended file to avoid breakageRobin Rosenberg2012-09-251-1/+1
| | | | | | | | | | | | | | | | | | This case breaks when the default is to disallow empty commits. Change-Id: Ibc223092eefe9f4b21374717dee5a9399bf890f9
* | | Merge "Allow @ in branch names and tighten syntax checking"Robin Rosenberg2012-09-242-7/+86
|\ \ \
| * | | Allow @ in branch names and tighten syntax checkingRobin Rosenberg2012-09-232-7/+86
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Valid refs are defined by git-check-ref-format(1). In addition we will not try to perform a lookup of an invalid ref name in Repository.resolve(). Reported by R Shapiro in the Eclipse JGit Forum. Change-Id: I0b098eec9ecb98a9ce16b1cfb476729aaf2fb190
* | | Merge "FileBasedConfig supports UTF-8 byte order marker"Robin Rosenberg2012-09-243-2/+196
|\ \ \
| * | | FileBasedConfig supports UTF-8 byte order markerMarc Strapetz2012-09-243-2/+196
| | | | | | | | | | | | | | | | Change-Id: I1f5dc07182dbf6bba2a9f4807fdd25b475da4ead
* | | | Merge "Fix typo in AnyObjectId#abbreviate"Robin Rosenberg2012-09-241-2/+2
|\ \ \ \
| * | | | Fix typo in AnyObjectId#abbreviateRobin Stocker2012-09-241-2/+2
| | |/ / | |/| | | | | | | | | | Change-Id: I5796dc81727a8e1923189e9490a55c4af6ad053e
* | | | Merge "Add toString for TrackingRefUpdate"Robin Rosenberg2012-09-241-0/+17
|\ \ \ \
| * | | | Add toString for TrackingRefUpdateRobin Stocker2012-09-241-0/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it much easier to debug the results of OperationResult#getTrackingRefUpdates (which otherwise requires digging into a TreeMap structure). Change-Id: I90da5385ee47c441404728f252eb3a100c48ee1c
* | | | Merge "Refuse to checkout unmerged paths from index"Christian Halstrick2012-09-242-1/+29
|\ \ \ \
| * | | | Refuse to checkout unmerged paths from indexRobin Stocker2012-09-232-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this check, the checkout was done but the result was a "both deleted" status when inspecting it with C Git. Found this while working on bug 390147. Change-Id: Ic3693f2c651827239e838bf7f37da842a7ae9707
* | | | | Comment an empty block which is okRobin Rosenberg2012-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I552d4481e17a12b0bd707d5386f29026ae0856fb
* | | | | Remove unnecessary @SuppressWarningsRobin Rosenberg2012-09-231-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic7b8494713d59574ee8f064a5c1042b48aedf012
* | | | | Remove uses of TextBuiltin.out in favor of outwRobin Rosenberg2012-09-233-14/+18
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | These came from patches in review in parallel with the introduction of the exception throwing print writer. Change-Id: I1c27fa276eb1fcf12ad19792049c35cb52518c16
* | | | Merge "The constructor CmdLineException(String) is deprecated"Robin Rosenberg2012-09-236-20/+36
|\ \ \ \ | |/ / / |/| | |
| * | | The constructor CmdLineException(String) is deprecatedTomasz Zarna2012-09-236-20/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use CmdLineException(CmdLineParser, String) instead. The new constructor has been added in args4j 2.0.12, so in pom.xml that would be the minimum version. Set the upper boundary in pom.xml to 2.1.0 (exclusive), just like in the MANIFEST.MF. Change-Id: If45d809e4ffa11a3572d958ce121422fb03cf8f3 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | | Merge changes Ic2b78ba9,Ia13e63edShawn O. Pearce2012-09-226-9/+17
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | * changes: Use '406 Not Acceptable' when info/refs is disabled Compress large /info/refs responses on HTTP
| * | | Use '406 Not Acceptable' when info/refs is disabledShawn O. Pearce2012-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of a confusing 403 Forbidden error indicating the dumb file service is disabled on this server, use 406 Not Acceptable to mean the client sent a request for content (the plain info/refs file) that this server does not want to provide. The stock C Git client will report HTTP 406 error if it predates 1.6.6 or something goes wrong with the smart request and it tried falling back to the dumb request. This may help to debug cases where a broken proxy server exists between the client and the server and has mangled a prior smart info/refs response. Change-Id: Ic2b78ba9502e4bbdff7cc3ba1fd284cf7616412b
| * | | Compress large /info/refs responses on HTTPShawn O. Pearce2012-09-195-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable streaming compression for any response that is bigger than the 32 KiB buffer used by SmartOutputStream. This is useful on the info/refs file which can have many branches and tags listed, and is often bigger than 32 KiB, but also compresses by at least 50%. Disable streaming compression on large git-upload-pack responses, as these are usually highly compressed Git pack data. Trying to compress these with gzip will only waste CPU time and additional transfer space with the gzip wrapper. Small git-upload-pack data is usually text based negotiation responses and can be squeezed smaller with a little bit of CPU usage. Change-Id: Ia13e63ed334f594d5e1ab53a97240eb2e8f550e2
* | | | Suppress boxing warnings where we know they are okRobin Rosenberg2012-09-2226-50/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invoke the wrapper types' valueOf via static imports. For booleans used in asserts, add a new assert in the JUnit utility package since out current version of JUnit does not have the assert(boolean, boolean) method. Change-Id: I9099bd8efbc8c133479344d51ce7dabed8958a2b
* | | | Merge "Fixed instability in some GC tests."Matthias Sohn2012-09-201-11/+7
|\ \ \ \
| * | | | Fixed instability in some GC tests.Sasa Zivkov2012-09-201-11/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some GC tests were sporadically failing. The reason was that they used the setExpireAgeMillis method to define object expiration before invoking the prune method. Depending on the CPU load during the test run, the prune method may reach an object (which is considered non-expired by the test) too late and actually prune it. To make the test stable we now use the setExpire(Date expire) method and define a time instant before which objects are considered to be expired. This way the outcome of the prune method doesn't depend on the CPU load. Change-Id: Ifc3323ca55ae56dbccdbc90a282ec3cf18ad7297 Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
* / / / Fix the javadoc for GC.setExpireSasa Zivkov2012-09-201-3/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | Clarify expiration of objects with the modification time exactly at the given time instant. Change-Id: I2000aec89c8d6a95700380b0a32275d2d658f67e Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
* / / Use x-friends instead of x-internal to expose jgit for internal useRobin Rosenberg2012-09-191-1/+1
|/ / | | | | | | | | | | | | This prevents a lot of unnecessary warnings about disouraged usage of the org.eclipse.jgit.internal package within JGit itself. Change-Id: Ia6683902809425fd7245e7d5d344c2ff8f317ebb
* | Prepare 2.2.0 buildsMatthias Sohn2012-09-1941-235/+235
| | | | | | | | | | Change-Id: I386ba70541d644e58661d26713b309371e0f9257 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-2.1'Matthias Sohn2012-09-197-45/+203
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.1: Prepare for 2.1 maintenance changes JGit v2.1.0.201209190230-r Introduce "never" as parseable date Introduce ParseExceptions for GitDateParser Support config param "gc.pruneexpire" Change-Id: If149d7f968a3425d9425f6ba9ce135a8341776a7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare for 2.1 maintenance changesstable-2.1Matthias Sohn2012-09-1941-52/+52
| | | | | | | | | | | | Change-Id: I436f36a7c6dc86916eb4cde038b27f9fb183465a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 01:58:02 +0000