]> source.dussan.org Git - jgit.git/log
jgit.git
11 years agoAlso use MockSystemReader in GitDateParserBadlyFormattedTest 66/18066/1
Matthias Sohn [Tue, 5 Nov 2013 08:29:13 +0000 (09:29 +0100)]
Also use MockSystemReader in GitDateParserBadlyFormattedTest

All tests should use MockSystemReader to isolate them from the
underlying platform specifics.

GitDateParserBadlyFormattedTest wasn't using MockSystemReader which
induced Bug 420772 as a side effect since GitDateParser caches
SimpleDateFormat instances without regarding their locale. This will be
fixed in another change

Bug: 420772
Change-Id: I798e55d05730a71bb0326f80aea5488541d6c1f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMerge "testMaliciousPathEmpty fails on Windows"
Christian Halstrick [Mon, 4 Nov 2013 12:39:43 +0000 (07:39 -0500)]
Merge "testMaliciousPathEmpty fails on Windows"

11 years agoMerge "Revert "Close unfinished archive entries on error""
Dave Borowitz [Sat, 2 Nov 2013 03:12:29 +0000 (23:12 -0400)]
Merge "Revert "Close unfinished archive entries on error""

11 years agoEnable to prepare interactive rebase and then start it explicitly 55/16755/6
Tobias Pfeifer [Thu, 11 Jul 2013 09:09:30 +0000 (11:09 +0200)]
Enable to prepare interactive rebase and then start it explicitly

Add Operation.PROCESS_STEPS to RebaseCommand to enable starting
interactive rebase explicitly after rebase steps have been configured.

Change-Id: I2d6f0de82010ea6523fbce6fb4501e847bdcdddc
Signed-off-by: Tobias Pfeifer <to.pfeifer@web.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agotestMaliciousPathEmpty fails on Windows 63/17963/1
Robin Rosenberg [Fri, 1 Nov 2013 15:43:46 +0000 (16:43 +0100)]
testMaliciousPathEmpty fails on Windows

Checking of spaces at the end of the file name caused the
test to fail for Windows only.

Bug: 396662
Change-Id: I47bcccb0fa32ce606276c3f30d454851d115ca11
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
11 years agoParse commitId and shortMessage of a commented out line in rebase todo 29/15129/4
Tobias Pfeifer [Mon, 5 Aug 2013 10:54:23 +0000 (12:54 +0200)]
Parse commitId and shortMessage of a commented out line in rebase todo

A rebase todo file consists of regular non-comment action lines and
comment lines. In case that a regular action line has been commented out
(i.e. prefixed with a hash '#'), the RebaseTodoLine that is representing
this line should hold the values for commitId and shortMessage even
though it's a comment line. This allows to switch between comment and
non-comment easily even after the file has been persisted and reread.

Change-Id: I56ec2ba08eaf3772e2d74d937dd496209a744d4b
Signed-off-by: Tobias Pfeifer <to.pfeifer@web.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoEnhance reading of git-rebase-todo formatted files 07/15007/10
Christian Halstrick [Tue, 30 Jul 2013 12:00:18 +0000 (14:00 +0200)]
Enhance reading of git-rebase-todo formatted files

Reading and writing files formatted like the git-rebase-todo files was
hidden in the RebaseCommand. Certain constructs (like leading tabs and
spaces) have not been handled as in native git. Also the upcoming
rebase interactive feature in EGit needs reading/writing these files
independently from a RebaseCommand.

Therefore reading and writing those files has been moved to the
Repository class. RebaseCommand gets smaller because of that and doesn't
have to deal with reading/writing files.

Additional tests for empty todo-list files, or files containing comments
have been added.

Change-Id: I323f3619952fecdf28ddf50139a88e0bea34f5ba
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Also-by: Tobias Pfeifer <to.pfeifer@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoEnhance RepositoryTestCase.commitFile() to work on empty repository 18/17618/2
Matthias Sohn [Sun, 20 Oct 2013 23:22:08 +0000 (01:22 +0200)]
Enhance RepositoryTestCase.commitFile() to work on empty repository

Change-Id: Ic64497f0eedf8996ba593ca52dc9a040732a5b24
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMerge "Add missing resources from source.. in build.properties"
Matthias Sohn [Wed, 30 Oct 2013 22:21:28 +0000 (18:21 -0400)]
Merge "Add missing resources from source.. in build.properties"

11 years agoRemove protobuf from target platform 87/17887/2
Matthias Sohn [Wed, 30 Oct 2013 14:01:01 +0000 (15:01 +0100)]
Remove protobuf from target platform

Change-Id: Ic160a021c376f02c8a839a766c69a0558f2a361e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoAdd missing resources from source.. in build.properties 43/12543/5
Tomasz Zarna [Mon, 6 May 2013 17:24:28 +0000 (19:24 +0200)]
Add missing resources from source.. in build.properties

Change-Id: Ief9b84c07494bdb01ce16b4ae3353c5364cc6625
Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
11 years agoSupport extension of TransportHttp 58/15858/2
Michael Nelson [Mon, 26 Aug 2013 16:35:48 +0000 (09:35 -0700)]
Support extension of TransportHttp

This allows subclasses to configure the HTTP connection (for example,
to add headers to the request).

Bug: 400724
Change-Id: I6f9d699e158a7b9d813c8fa8d273992a28994e41
Signed-off-by: Michael Nelson <michael.nelson@tasktop.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
11 years agoCLI fetch command should support --tags 33/17433/2
Kaloyan Raev [Fri, 11 Oct 2013 08:44:53 +0000 (11:44 +0300)]
CLI fetch command should support --tags

Bug: 419638
Change-Id: I1dc99fd38e678e091a1d141d741328f0dec1756a
Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
11 years agoAdd missing JUnit dependency in MANFEST.MF 33/17633/2
Rüdiger Herrmann [Tue, 22 Oct 2013 08:59:37 +0000 (10:59 +0200)]
Add missing JUnit dependency in MANFEST.MF

Bug: 419998
Change-Id: Ie49ad97cb86d51274251296cee559141bfdb9fc9
Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoAdd / fix @since tags 19/17719/1
Matthias Sohn [Thu, 24 Oct 2013 06:32:47 +0000 (08:32 +0200)]
Add / fix @since tags

Change-Id: I1e5bea968b3c79df4f600b75fde5b547ebadde36
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMake sure SystemReader is reset after test is run 16/17616/1
Robin Stocker [Mon, 21 Oct 2013 22:37:56 +0000 (00:37 +0200)]
Make sure SystemReader is reset after test is run

Otherwise the MockSystemReader from the test setup is active for other
tests.

Change-Id: I7caf693bd692d06936e29efd4dc4aabb48c1c39b
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years agoMerge "Add describe command to JGit command line interface"
Robin Rosenberg [Sun, 20 Oct 2013 16:31:25 +0000 (12:31 -0400)]
Merge "Add describe command to JGit command line interface"

11 years agoMerge "Fix failed tests when the tmp directory is a symlink"
Matthias Sohn [Sat, 19 Oct 2013 22:14:46 +0000 (18:14 -0400)]
Merge "Fix failed tests when the tmp directory is a symlink"

11 years agoFix failed tests when the tmp directory is a symlink 45/17145/3
Robin Rosenberg [Tue, 8 Oct 2013 08:35:39 +0000 (10:35 +0200)]
Fix failed tests when the tmp directory is a symlink

On Mac OS X /tmp is by default a symbolic link.

Change-Id: I0913ee5ee8db5c5918a9e41abbbfe125b6c70783
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMerge changes I5a5a2387,I04805ce2
Robin Rosenberg [Sat, 19 Oct 2013 13:55:58 +0000 (09:55 -0400)]
Merge changes I5a5a2387,I04805ce2

* changes:
  Describe HEAD if no explicit target was set
  Allow to set target of DescribeCommand

11 years agoScripts to publish jgit artifacts on Maven central 66/14466/3
Matthias Sohn [Wed, 10 Jul 2013 22:20:09 +0000 (00:20 +0200)]
Scripts to publish jgit artifacts on Maven central

- you need an account on oss.sonatype.org and permissions for group id
  org.eclipse.jgit, see [1]
- install ruby [2] if necessary
- run download.rb to download the Maven artifacts from repo.eclipse.org
- then run deploy.rb to stage the artifacts on oss.sonatype.org
- follow [3] to close the staging repository which triggers some sanity
checks on Nexus
- ask community to test artifacts from staging repository
- if tests are ok release the staging repository as described in [4]

[1] https://issues.sonatype.org/browse/OSSRH-2758
[2] https://www.ruby-lang.org/en/downloads/
[3]
https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-7b.StageExistingArtifacts
[4]
https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-8a.ReleaseIt

Change-Id: I830f2392b9234e585b01dbb4a5a369edd88796a2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoCLI version command falls back to Bundle-Version 37/17237/4
Kaloyan Raev [Wed, 9 Oct 2013 19:40:48 +0000 (22:40 +0300)]
CLI version command falls back to Bundle-Version

If the version command cannot read the Implementation-Version of the
containing JAR fall back to read the Bundle-Version header in
MANIFEST.MF. This makes the command working also from the
org.eclipse.jgit.pgm bundle and during development in a host IDE.

Bug: 419087
Change-Id: I4269d1cbd9bf9fd8be6fb4463aecc1c434aa387b
Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoAdd describe command to JGit command line interface 86/17286/3
Matthias Sohn [Thu, 10 Oct 2013 16:40:42 +0000 (18:40 +0200)]
Add describe command to JGit command line interface

Change-Id: I1560fd2be417361b3d2df15a27618053031bd873
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoDescribe HEAD if no explicit target was set 85/17285/2
Matthias Sohn [Thu, 10 Oct 2013 21:01:30 +0000 (23:01 +0200)]
Describe HEAD if no explicit target was set

Change-Id: I5a5a238709df813ec07278bb3b4f9ea5c85c0883
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoAllow to set target of DescribeCommand 84/17284/2
Matthias Sohn [Thu, 10 Oct 2013 16:32:03 +0000 (18:32 +0200)]
Allow to set target of DescribeCommand

Change-Id: I04805ce20cc203f5e491406c39b71e7017553b37
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoList all supported formats in archive command's help 83/17283/1
Matthias Sohn [Thu, 10 Oct 2013 15:53:09 +0000 (17:53 +0200)]
List all supported formats in archive command's help

Change-Id: I4bd271cb348914642069239853488f4960444746
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMerge "Add support for --version in JGit CLI"
Robin Stocker [Thu, 10 Oct 2013 11:53:57 +0000 (07:53 -0400)]
Merge "Add support for --version in JGit CLI"

11 years agoAdd resources/ as source folder in build.properties 38/17238/2
Kaloyan Raev [Wed, 9 Oct 2013 13:58:29 +0000 (16:58 +0300)]
Add resources/ as source folder in build.properties

This allows correct export of org.eclipse.jgit.pgm via the PDE Export
wizard.

Bug: 419089
Change-Id: I98765208edd7df59e262001dd01ed2b43e4475a9
Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
11 years agoAdd support for --version in JGit CLI 30/17230/1
Kaloyan Raev [Wed, 9 Oct 2013 10:52:47 +0000 (13:52 +0300)]
Add support for --version in JGit CLI

Bug: 419000
Change-Id: I43f5267182ea69d1f9abbff33136e0491c629071
Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
11 years agoFix ServiceMayNotContinueException constructors for Java 1.5 76/17176/1
Colby Ranger [Tue, 8 Oct 2013 17:16:45 +0000 (10:16 -0700)]
Fix ServiceMayNotContinueException constructors for Java 1.5

IOException did not add a (String, Throwable) constructor until 1.5.
Instead use the String super constructor and initCause to initialize
the exception.

Fixes bug 418889

Change-Id: Ide735ecfc7d04884981b79b57a4275863ce17006

11 years agoAdd constructors that take Throwable to ServiceMayNotContinueException. 35/17135/4
Colby Ranger [Mon, 7 Oct 2013 21:14:01 +0000 (14:14 -0700)]
Add constructors that take Throwable to ServiceMayNotContinueException.

ServiceMayNotContinueException usually wraps an underlying exception.
Add convenience constructors that take Throwable. In the case a
string is not provided, the message defaults to "internal server error",
since it may be reported to the client.

Change-Id: I15dc20306826c352f69e88afb7ed6927c12b6c1f

11 years agoPropagate IOException where possible when getting refs. 22/17122/2
Colby Ranger [Mon, 7 Oct 2013 17:25:28 +0000 (10:25 -0700)]
Propagate IOException where possible when getting refs.

Currently, Repository.getAllRefs() and Repository.getTags() silently
ignores an IOException and instead returns an empty map. Repository
is a public API and as such cannot be changed until the next major
revision change. Where possible, update the internal jgit APIs to
use the RefDatabase directly, since it propagates the error.

Change-Id: I4e4537d8bd0fa772f388262684c5c4ca1929dc4c

11 years agoPrepare 3.2.0-SNAPSHOT builds 02/17002/2
Matthias Sohn [Thu, 3 Oct 2013 15:40:22 +0000 (17:40 +0200)]
Prepare 3.2.0-SNAPSHOT builds

Change-Id: Iac6cf7a5bb6146ee3fe38abe8020fc3fc4217584
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMerge branch 'stable-3.1' 01/17001/1
Matthias Sohn [Thu, 3 Oct 2013 15:39:03 +0000 (17:39 +0200)]
Merge branch 'stable-3.1'

* stable-3.1:
  Prepare post 3.1.0 builds
  JGit v3.1.0.201310021548-r
  Fix order of commits in rebase todo file header
  Prepare post 3.1.0 RC1 builds
  JGit v3.1.0.201309270735-rc1
  Attempt to fix graph layout when new heads are introduced
  Prepare re-signing pgm's ueberjar to avoid SecurityException
  Use full branch name when getting ref in BranchTrackingStatus

Change-Id: Ida30175d0c058048cbe4b563aae7f85cd008db29
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoPrepare post 3.1.0 builds 99/16999/1 stable-3.1
Matthias Sohn [Thu, 3 Oct 2013 15:22:08 +0000 (17:22 +0200)]
Prepare post 3.1.0 builds

Change-Id: I306a3d40c6ddb88a16d17f09a60e3d19b0716962
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoJGit v3.1.0.201310021548-r 72/16972/1 v3.1.0.201310021548-r
Matthias Sohn [Wed, 2 Oct 2013 20:09:19 +0000 (22:09 +0200)]
JGit v3.1.0.201310021548-r

Change-Id: I2170b13047d5eab7565f47f9feb1680e03b1ba09
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMerge "Added the git-describe implementation"
Matthias Sohn [Wed, 2 Oct 2013 19:45:22 +0000 (15:45 -0400)]
Merge "Added the git-describe implementation"

11 years agoFix order of commits in rebase todo file header 25/16825/2
Stefan Lay [Fri, 27 Sep 2013 08:55:56 +0000 (10:55 +0200)]
Fix order of commits in rebase todo file header

Change-Id: I0e41d89bbd4fc01ad3b3d05a45ee60af853bfae7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoPrepare post 3.1.0 RC1 builds 40/16840/1
Matthias Sohn [Fri, 27 Sep 2013 13:54:08 +0000 (15:54 +0200)]
Prepare post 3.1.0 RC1 builds

Change-Id: I060f2082ccd0c91905b6b29a49cc633a0b51a1f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoJGit v3.1.0.201309270735-rc1 30/16830/1 v3.1.0.201309270735-rc1
Matthias Sohn [Fri, 27 Sep 2013 11:34:51 +0000 (13:34 +0200)]
JGit v3.1.0.201309270735-rc1

Change-Id: I48202dd461110da25f9bc159c938311fff0669e0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoAdded the git-describe implementation 71/14871/10
Kohsuke Kawaguchi [Thu, 25 Jul 2013 17:42:22 +0000 (10:42 -0700)]
Added the git-describe implementation

CQ: 7609
Bug: 339246
Change-Id: I689bc0578ce3a430b9800ad84122e221c69829f4
Signed-off-by: Kohsuke Kawaguchi <kk@kohsuke.org>
Also-By: Robin Stocker<robin@nibor.org>
Also-By: Matthias Sohn <matthias.sohn@sap.com>
Also-By: Christian Halstrick <christian.halstrick@sap.com>
11 years agoAttempt to fix graph layout when new heads are introduced 92/16792/1
Robin Rosenberg [Sun, 17 Mar 2013 20:01:24 +0000 (21:01 +0100)]
Attempt to fix graph layout when new heads are introduced

Sometime the new commit is no allocated onto a new lane leading to
the commit being drawn on the wrong branch and something that looks
like a merge.

The drawback is that this also changes existing valid graphs.

Bug: 368927
Change-Id: Ic8a8247c8a53be802c1be83850ed766b902ca646

11 years agoPrepare re-signing pgm's ueberjar to avoid SecurityException 11/16711/2
Matthias Sohn [Tue, 24 Sep 2013 07:11:47 +0000 (09:11 +0200)]
Prepare re-signing pgm's ueberjar to avoid SecurityException

Since we now sign all build artifacts immediately after creating them
we need to re-sign the ueberjar created for jgit command line tool
because the signatures of the individual jars are invalidated when
repacking them into the ueberjar. Hence we need to exclude the
signatures of the individual jars when using maven-shade-plugin to
create the ueberjar.

Also install the shaded plugin into maven repository and exclude osgi
framework sources which were included unintentionally.

See http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02277.html

Change-Id: Ia302e68a4b2a9399cb18025274574e31d3d3e407
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoRevert "Close unfinished archive entries on error" 10/16710/1
Jonathan Nieder [Tue, 24 Sep 2013 00:35:15 +0000 (17:35 -0700)]
Revert "Close unfinished archive entries on error"

This reverts commit 75d9b31f14d6226a535a80c05cffda29e55d2ceb.
Now that we do not try to close the ArchiveOutputStream in the error
path, there is no need to artificially close partial entries from
before the error.

Change-Id: I1f1cb08ec4e9b14c79bf4621f3fa959463034b82
Signed-off-by: Jonathan Nieder <jrn@google.com>
11 years agoDo not close ArchiveOutputStream on error 09/16709/4
Jonathan Nieder [Tue, 24 Sep 2013 00:06:18 +0000 (17:06 -0700)]
Do not close ArchiveOutputStream on error

If we encounter an I/O error while writing an archive (for example due
to the reader of an HTTP stream closing the connection), the result is
an archive with unclosed entries, causing
TarArchiveOutputStream.finish() to throw IOException("This archives
contains unclosed entries"), hiding the IOException that caused the
early termination.

The unclosed entries are fine: the same exception that occured in the
first place will probably prevent closing the entries before finishing
this partial archive that should be discarded anyway.

It would be nicer to call TarArchiveOutputStream.finish and leave the
underlying OutputStream unclosed --- all callers close it already ---
but that would be a more invasive change so we hold off for now.

Change-Id: I328ced19aa8a1888e5353cdbb6106a85fd72d5d7
Signed-off-by: Jonathan Nieder <jrn@google.com>
11 years agoUse full branch name when getting ref in BranchTrackingStatus 80/16580/2
Robin Stocker [Sun, 15 Sep 2013 21:26:35 +0000 (23:26 +0200)]
Use full branch name when getting ref in BranchTrackingStatus

In case there is both a tag and branch called "foo", the tag is returned
if calling getRef with the short name. By using refs/heads/foo, the
branch is returned.

Bug: 417158
Change-Id: I86b4f83955586bb24774fd621f5012499cf67909
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoIgnore bitmap indexes that do not match the pack checksum 18/16618/4
Colby Ranger [Thu, 19 Sep 2013 21:33:13 +0000 (14:33 -0700)]
Ignore bitmap indexes that do not match the pack checksum

If `git gc` creates a new pack with the same file name, the
pack checksum may not match that in the .bitmap. Fix the PackFile
implementaion to silently ignore invalid bitmap indexes.

Fixes Issue https://code.google.com/p/gerrit/issues/detail?id=2131

Change-Id: I378673c00de32385ba90f4b639cb812f9574a216

11 years agoMerge branch 'stable-3.0' 03/16503/1
Matthias Sohn [Tue, 17 Sep 2013 13:08:55 +0000 (15:08 +0200)]
Merge branch 'stable-3.0'

* stable-3.0:
  JGit v3.0.3.201309161630-r
  Add org.eclipse.jgit.java7.source to jgit source feature

Change-Id: I738afcfbc78ea1ac56d0d0ab7d4f7717167dd8dd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoJGit v3.0.3.201309161630-r 83/16483/1 stable-3.0 v3.0.3.201309161630-r
Matthias Sohn [Mon, 16 Sep 2013 20:29:58 +0000 (22:29 +0200)]
JGit v3.0.3.201309161630-r

Change-Id: I73ff609ba681500394b5919f62cff9ec24a52756
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoRemove unneeded packs when compacting with no new objects
Colby Ranger [Mon, 16 Sep 2013 18:56:02 +0000 (11:56 -0700)]
Remove unneeded packs when compacting with no new objects

Previously, the DfsPackCompactor exited without pruning the existing
packs, when no new packs were created.

Change-Id: I5e3b6f8c789706c7a982e6ae93cf7c3d4346797c

11 years agoAdd org.eclipse.jgit.java7.source to jgit source feature 57/16457/1
Matthias Sohn [Mon, 16 Sep 2013 09:19:43 +0000 (11:19 +0200)]
Add org.eclipse.jgit.java7.source to jgit source feature

Change-Id: Ifd9153f77c246a67d5d15734667dc2360718a390
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoResetCommand: Allow reset on unborn branch when ref not specified 64/15364/3
Robin Stocker [Mon, 12 Aug 2013 13:13:03 +0000 (15:13 +0200)]
ResetCommand: Allow reset on unborn branch when ref not specified

In C Git 1.8.2, "git reset" now also works on an unborn branch (no HEAD
yet) if no explicit ref was specified. In that case, it is treated as a
reset to an empty tree.

This can be useful for callers because "unborn branch" no longer has to
be special-cased to "git rm --cached".

Bug: 414870
Change-Id: Ied750116f767518ae4d48823cf00752b049a8477
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMerge branch 'stable-3.0' 47/16347/1
Matthias Sohn [Wed, 11 Sep 2013 21:14:42 +0000 (23:14 +0200)]
Merge branch 'stable-3.0'

* stable-3.0:
  Prepare post 3.0.2 builds
  JGit v3.0.2.201311090911-r

Change-Id: I99a7d1072285646f7fcd4169225c1fd249ad5e37
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoPrepare post 3.0.2 builds 31/16331/1
Matthias Sohn [Wed, 11 Sep 2013 14:51:47 +0000 (16:51 +0200)]
Prepare post 3.0.2 builds

Change-Id: Ie1bd951a2cb35d069c94dab4a62507115913764f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoJGit v3.0.2.201311090911-r 18/16318/1 v3.0.2.201311090911-r
Matthias Sohn [Wed, 11 Sep 2013 13:15:00 +0000 (15:15 +0200)]
JGit v3.0.2.201311090911-r

Change-Id: Ifaae2e3e2f1bb0504bf9e6d59983086ac19a540b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoDon't treat "/" as valid ignore pattern 55/15955/2
Robin Stocker [Wed, 28 Aug 2013 20:57:37 +0000 (22:57 +0200)]
Don't treat "/" as valid ignore pattern

This matches the behavior of C Git.

Bug: 415767
Change-Id: Ifa6500f3f6a033da40c48287630b77c47b15f4a0
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years agoMerge "Add missing usage texts for JGit commandline commands"
Matthias Sohn [Mon, 9 Sep 2013 21:04:58 +0000 (17:04 -0400)]
Merge "Add missing usage texts for JGit commandline commands"

11 years agoAdd missing usage texts for JGit commandline commands 99/13999/5
Matthias Sohn [Sat, 22 Jun 2013 00:19:08 +0000 (02:19 +0200)]
Add missing usage texts for JGit commandline commands

Also update help text for the merge command now supporting recursive
strategy as the default merge strategy.

Change-Id: I07886fe875c407e2244f562c003bb9d04f398026
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoAdd missing dependency for testing ArchiveCommand with xz compression 12/16212/1
Matthias Sohn [Mon, 26 Aug 2013 14:38:42 +0000 (16:38 +0200)]
Add missing dependency for testing ArchiveCommand with xz compression

Without this dependency the ArchiveTest.testTxzExtension() fails with a
ClassNotFoundException if it is started from Eclipse.

Change-Id: Ief2fceaaffab7641ba63ace4577462fa3bbf1c13
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMerge "Remove unnecessary inflate stride in DfsBlock"
Shawn Pearce [Wed, 4 Sep 2013 23:13:55 +0000 (19:13 -0400)]
Merge "Remove unnecessary inflate stride in DfsBlock"

11 years agoRemove unnecessary inflate stride in DfsBlock 36/16136/3
Shawn Pearce [Wed, 4 Sep 2013 19:56:38 +0000 (12:56 -0700)]
Remove unnecessary inflate stride in DfsBlock

OpenJDK 7 does not benefit from using an inflate stride on the input
array. The implementation of java.util.zip.Inflater supplies the
entire input byte[] to libz, with no regards for the bounds supplied.
Slicing at 512 byte increments in DfsBlock no longer has any benefit.

In OpenJDK 6 the native portion of Inflater used GetByteArrayRegion
to obtain a copy of the input buffer for libz. In this use case
supplying a small stride made sense, it avoided allocating space
for and copying data past the end of the object's compressed stream.

In OpenJDK 7 the native code uses GetPrimitiveArrayCritical,
which tries to avoid copying by freezing Java garbage collection
and accessing the byte[] contents in place. On OpenJDK 7 derived
JVMs it is likely more efficient to supply the entire DfsBlock.

Since OpenJDK 5 and 6 are deprecated and replaced by OpenJDK 7
it is reasonable to suggest any consumers running JGit with DFS
support use an OpenJDK 7 derived JVM. However, JGit still targets
local filesystem support on Java 5, so it is still not reasonble to
apply this same simplification to the internal.storage.file package.

See: JDK-6751338 (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6751338)
Change-Id: Ib248b6d383da5c8aa887d9c355a0df6f3e2247a5

11 years agoMerge branch 'stable-3.0' 38/16138/1
Matthias Sohn [Wed, 4 Sep 2013 20:45:53 +0000 (22:45 +0200)]
Merge branch 'stable-3.0'

* stable-3.0:
  Prepare post 3.0.2-rc2 builds
  JGit v3.0.2.201309041250-rc2
  Uncomment eclipse-jar-signer plugin
  Update build to use CBI jarsigner plugin
  Update maven plugins
  Update to Orbit Kepler SR1 release R20130827064939

Change-Id: Iaa8bba21c300dd1de2b91a77cddf6727fbc66340
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoPrepare post 3.0.2-rc2 builds 28/16128/1
Matthias Sohn [Wed, 4 Sep 2013 17:34:24 +0000 (19:34 +0200)]
Prepare post 3.0.2-rc2 builds

Change-Id: I0e4020326c6443ba7157c18b345160cf9e1e88a7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoJGit v3.0.2.201309041250-rc2 22/16122/1 v3.0.2.201309041250-rc2
Matthias Sohn [Wed, 4 Sep 2013 16:55:13 +0000 (18:55 +0200)]
JGit v3.0.2.201309041250-rc2

Change-Id: Ie18ced75f573f140969af2a7d9edb45c76523715
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoUncomment eclipse-jar-signer plugin 15/16115/1
Matthias Sohn [Wed, 4 Sep 2013 15:05:33 +0000 (17:05 +0200)]
Uncomment eclipse-jar-signer plugin

This was commented out by mistake.

Change-Id: Ia1f6518ab7c7466d11710225f815b755fbf4d387
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoUpdate build to use CBI jarsigner plugin 21/15921/21
Matthias Sohn [Fri, 30 Aug 2013 22:26:18 +0000 (00:26 +0200)]
Update build to use CBI jarsigner plugin

The dash signing plugin has been retired hence we need to update our
build to use the CBI jarsigner plugin for signing build results.

Pack test classes to enable signing them.

Also re-enable pack200 for bundle org.eclipse.jgit.

WORKAROUND: there is no easy way to run tests with maven-surefire-plugin
from signed test-jar so for a quick workaround we will have to add a
build step on Hudson so that we can run tests before signing:
- first step will do "clean, verify" to compile and run tests
- second step will do "install, deploy" with profile "eclipse-sign" and
  use -DskipTests=true to skip tests since they would hit a
  SecurityException when unsigned test classes are in same package as
  signed classes under test
- third step will do "clean, install, deploy" on packaging reactor to
  build features and p2 repository with profile "eclipse-sign" to sign
  and pack200 all bundles.

TODO: Tycho doesn't suport picking up pack200 artifacts via
pomDependencies hence we need to find a way to copy them manually and
use tycho-extra's tycho-p2-extras-plugin:publish-features-and-bundles
to generate the missing p2 metadata.

Change-Id: Iec2c5ab3027a3e3f9ecc0d2f99193385177d9025
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoUpdate maven plugins 17/16017/1
Matthias Sohn [Fri, 30 Aug 2013 21:09:12 +0000 (23:09 +0200)]
Update maven plugins

Change-Id: Idda470ff355cc1ab559c3c64189e8b1df173dc55
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoUpdate to Orbit Kepler SR1 release R20130827064939 18/15918/1
Matthias Sohn [Tue, 27 Aug 2013 22:13:03 +0000 (00:13 +0200)]
Update to Orbit Kepler SR1 release R20130827064939

Change-Id: I6849fc5cb81e8ac47ce1b2c5a74737b23c089fc1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoLogCommand: Remove outdated TODO and improve docs 40/15540/2
Robin Stocker [Fri, 16 Aug 2013 13:38:43 +0000 (15:38 +0200)]
LogCommand: Remove outdated TODO and improve docs

Change-Id: I368be12e7bdc3c711e9f474ead312006513764b7
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years agoMerge branch 'stable-3.0' 09/15809/1
Matthias Sohn [Thu, 22 Aug 2013 20:50:43 +0000 (22:50 +0200)]
Merge branch 'stable-3.0'

* stable-3.0:
  Update reflog like C Git during rebase (non-interactive)
  Make sure checkout is not deleting folders outside the workingtree
  Update to Jetty 7.6.11.v20130520
  Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilter
  Refactor PathSuffixFilterTest to remove duplication
  Check parentFile is not null
  Update HEAD in cherry-picking several commits
  Fix HTTP response processing for WWW-Authenticate headers
  Don't skip want validation when the client sends no haves
  Fix tests for OS X when the tmpdir is the default /tmp
  Fix running maven http tests on OS X
  Recognize CRLF when parsing the short message of a commit or tag
  Update build to use Tycho 0.18
  Add jgit target platform to define dependencies more precisely
  Prepare 3.0.2-SNAPSHOT builds

Change-Id: Icef0cd0cce9bbccf2b2cbb3471a3f4ce0655e22c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoUpdate reflog like C Git during rebase (non-interactive) 82/15582/2
Robin Rosenberg [Sun, 5 May 2013 23:39:25 +0000 (01:39 +0200)]
Update reflog like C Git during rebase (non-interactive)

Bug: 346350
Change-Id: I119766a00bc52a810c51cffaa19207cb8555ca22
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
11 years agoMake sure checkout is not deleting folders outside the workingtree 81/15581/2
Christian Halstrick [Mon, 9 Jan 2012 15:15:12 +0000 (16:15 +0100)]
Make sure checkout is not deleting folders outside the workingtree

There was a chance that jgit deletes symbolic links which point to the
folder on top of the working tree. Make sure not to touch these
resources.

Thanks to Cedric Darloy who reported this bug on
http://www.eclipse.org/forums/index.php/m/776910/#msg_776910 and to
Ondrej Vrabec who reported bug 412489.

Bug: 412489
Change-Id: I81735ba0394ef6794e9b2b8bdd8bd7e8b9c6460f
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years agoUpdate to Jetty 7.6.11.v20130520 09/15709/1
Matthias Sohn [Thu, 4 Jul 2013 22:06:05 +0000 (00:06 +0200)]
Update to Jetty 7.6.11.v20130520

Change-Id: I76d32444c9cf9f086a013e410a88d37a359272fd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoFix bugs in TreeWalk#isPathSuffix used by PathSuffixFilter 08/15708/1
Robin Stocker [Mon, 8 Jul 2013 08:51:52 +0000 (10:51 +0200)]
Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilter

* It didn't check the first character in the pattern due to a off-by-one
  error. Spotted by James Roper.
* It returned true even when pattern was longer than current path, e.g.
  it returned that ".txt" is suffix of "txt".

Bug: 411999
Change-Id: I9fbcd68a11fb57cc49956b70c387a47271a0424f
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years agoRefactor PathSuffixFilterTest to remove duplication 07/15707/1
Robin Stocker [Mon, 8 Jul 2013 08:48:45 +0000 (10:48 +0200)]
Refactor PathSuffixFilterTest to remove duplication

Makes it possible to add new test cases without copying lots of lines.

Change-Id: I66db3bc0cbd18fb5a07748905c60384b86b1c162
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years agoCheck parentFile is not null 06/15706/1
Hiroshi Tomita [Fri, 5 Jul 2013 00:04:00 +0000 (09:04 +0900)]
Check parentFile is not null

parentFile becomes null when f is relative path, such as ".".

This patch avoids NullPointerException in such case.

Change-Id: I4752674b1daab6eedd7c3650c7749462810eaffd
Signed-off-by: Hiroshi Tomita <tomykaira@gmail.com>
11 years agoUpdate HEAD in cherry-picking several commits 80/15580/2
Hiroshi Tomita [Sun, 30 Jun 2013 16:07:10 +0000 (01:07 +0900)]
Update HEAD in cherry-picking several commits

Without update, index is wrongly detected to be dirty
when picking the second commit.

Change-Id: Idf47ecb33e8bd38340d760806d629f67be92d2d5
Signed-off-by: Hiroshi Tomita <tomykaira@gmail.com>
Bug: 411963

11 years agoFix HTTP response processing for WWW-Authenticate headers 79/15579/2
Alex Rukhlin [Wed, 6 Mar 2013 21:35:52 +0000 (16:35 -0500)]
Fix HTTP response processing for WWW-Authenticate headers

The original code was able to process only one WWW-Authenticate
header in an HTTP response, and if this header was not one of
two expected, authentication failed regardless of that there
could be other headers in the response.

All WWW-Authenticate headers in an HTTP response have to be
browsed to find one of supported, i.e. Basic or Digest.
By that if both are present, the Digest one should be used
as more preferable.

Bug: 357719
Change-Id: Icf601a41fec63f7d40308f3c85aaa4f71a7c095b
Signed-off-by: Alex Rukhlin <arukhlin@microsoft.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoDon't skip want validation when the client sends no haves 05/15705/1
Dave Borowitz [Fri, 21 Jun 2013 23:14:30 +0000 (16:14 -0700)]
Don't skip want validation when the client sends no haves

Change-Id: I5e80b3befca5cf1dcb06075862d6d48e6491cc0f

11 years agoFix tests for OS X when the tmpdir is the default /tmp 78/15578/2
Robin Rosenberg [Sun, 16 Jun 2013 10:02:14 +0000 (12:02 +0200)]
Fix tests for OS X when the tmpdir is the default /tmp

/tmp is a symbolic link and some tests break when the path
gets canonicalized by JGit or Jetty. Allow Jetty to serve
symlinks by setting init parameter "aliases" to true [1].

[1] http://wiki.eclipse.org/Jetty/Howto/How_to_serve_symbolically_linked_files

Change-Id: I45359a40435e8a33def6e0bb6784b4d8637793ac
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoFix running maven http tests on OS X 77/15577/2
Robin Rosenberg [Sun, 16 Jun 2013 09:28:36 +0000 (11:28 +0200)]
Fix running maven http tests on OS X

In 36144e12d8 tests were changed to use the system tmp directory as defined
by java.io.tmpdir, which was then overridden in the pom files to usea custom
directory that made som tests work, but not all.

Change-Id: I2fa04878f8830ad9c9b32a6f3fe8d2e2d66fe411

11 years agoRecognize CRLF when parsing the short message of a commit or tag 76/15576/2
Robin Rosenberg [Sat, 30 Mar 2013 10:03:33 +0000 (11:03 +0100)]
Recognize CRLF when parsing the short message of a commit or tag

Bug: 400707
Change-Id: I9b09bb88528af465018fc0278f5441f7e6b75986

11 years agoUpdate build to use Tycho 0.18 04/15704/1
Matthias Sohn [Sat, 1 Jun 2013 22:26:59 +0000 (00:26 +0200)]
Update build to use Tycho 0.18

Change-Id: I66ffb2b6416dbbd5da11ad789dd58060b7ab09f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoAdd jgit target platform to define dependencies more precisely 03/15703/1
Matthias Sohn [Fri, 31 May 2013 22:36:17 +0000 (00:36 +0200)]
Add jgit target platform to define dependencies more precisely

Avoid that the packaging build picks an older jgit version coming with
eclipse platform by using a target platform which allows to define the
dependencies more precisely.

Change-Id: I39bba3baa4517e2b5e5fe0de096e756f2904e3e9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoPrepare 3.0.2-SNAPSHOT builds 75/15575/1
Matthias Sohn [Sun, 18 Aug 2013 23:12:10 +0000 (01:12 +0200)]
Prepare 3.0.2-SNAPSHOT builds

Change-Id: I3287609a90f068017cc62f4fd7738651e0663081
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoEnable LsRemoteCommand to work without local repository 26/14726/4
Robin Stocker [Sun, 21 Jul 2013 14:23:12 +0000 (16:23 +0200)]
Enable LsRemoteCommand to work without local repository

It's supported by C Git and can be useful.

Bug: 413388
Change-Id: I12c6c10e791cc09ee271d89eb8b8d32f53e385db
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoAdd missing @since tag for replaceLineBreaksWithSpace 84/15384/1
Robin Stocker [Mon, 12 Aug 2013 19:34:50 +0000 (21:34 +0200)]
Add missing @since tag for replaceLineBreaksWithSpace

Change-Id: Ibd9d9ba609a2cd7707b985cdb07405dce0422aab
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years agoAllow the command line bundle to access internal jgit packages 96/13996/2
Matthias Sohn [Fri, 21 Jun 2013 23:11:25 +0000 (01:11 +0200)]
Allow the command line bundle to access internal jgit packages

Change-Id: Id1e11a21fdcbd8cb0f2f8c22e7ab253e8df65d2f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoMerge "Recognize CRLF when parsing the short message of a commit or tag"
Robin Rosenberg [Sat, 10 Aug 2013 22:31:01 +0000 (18:31 -0400)]
Merge "Recognize CRLF when parsing the short message of a commit or tag"

11 years agoMerge "Added characters to be escaped in file name patterns"
Robin Rosenberg [Sat, 10 Aug 2013 21:32:20 +0000 (17:32 -0400)]
Merge "Added characters to be escaped in file name patterns"

11 years agoAdd missing @since tags 42/15042/9
Lars Vogel [Thu, 25 Jul 2013 21:28:05 +0000 (23:28 +0200)]
Add missing @since tags

Change-Id: I9754e2124c0fe6ad2dbde5597c3ed10f1c3efef5
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years agoAdvertise capabilities with no refs in upload service. 53/15253/2
Colby Ranger [Thu, 8 Aug 2013 14:57:49 +0000 (07:57 -0700)]
Advertise capabilities with no refs in upload service.

With reference hiding, it is possible for a repository to appear
empty when all refs are hidden. This causes capabilities to not be
advertised either, since they are published with the first reference,
breaking fetch by SHA1 support.

Always advertise the capabilites by publishing the symbolic capabilities
reference when the repository has no references to advertise (similar to
the receive service).

Change-Id: I8060e430ee03571dc51239e702864c85e888505c

11 years agoAllow UploadPack requests with no options 27/15227/1
Shawn Pearce [Wed, 7 Aug 2013 22:43:58 +0000 (15:43 -0700)]
Allow UploadPack requests with no options

UploadPack can be invoked with no capabilities selected by the
client if the client is an ancient version of Git that nobody in
their right mind should still be using. Or if the client is very
broken and does not want to use any of the newer features added to
the protocol since its inception.

Change-Id: I3baa6f90e6a41a37a8eab8449a3cc41f4efcb91a

11 years agoAdd --quiet flag to pgm fetch. 49/15149/1
Colby Ranger [Mon, 5 Aug 2013 22:12:57 +0000 (15:12 -0700)]
Add --quiet flag to pgm fetch.

Change-Id: If141fdc5c181b3a618b7e286ad3c6957211d0afc

11 years agoSend no-progress option with NullProgressMonitor. 48/15148/1
Colby Ranger [Mon, 5 Aug 2013 21:33:55 +0000 (14:33 -0700)]
Send no-progress option with NullProgressMonitor.

The NullProgressMonitor does not report progress anywhere. Inform the
server not to send progress by enabling the no-progress capability.

Change-Id: Id18dbc754c814d1a5534a284c947030bf201c569

11 years agoMerge "Change RequestValidator parameter to ObjectId list"
Shawn Pearce [Fri, 2 Aug 2013 22:15:19 +0000 (18:15 -0400)]
Merge "Change RequestValidator parameter to ObjectId list"

11 years agoChange RequestValidator parameter to ObjectId list 98/14898/4
Greg Hill [Fri, 26 Jul 2013 19:08:31 +0000 (12:08 -0700)]
Change RequestValidator parameter to ObjectId list

Instead of RevObject list, this allows a custom request validator to be called
on SHA-1's corresponding to objects that may not exist in repository storage

Change-Id: I19bb667beff0d0c144150a61d7a1dc6c9703be7f
Signed-off-by: Greg Hill <greghill@google.com>
11 years agoAdd setter for ProgressMonitor to StatusCommand 76/14876/5
Christian Trutz [Thu, 25 Jul 2013 21:28:05 +0000 (23:28 +0200)]
Add setter for ProgressMonitor to StatusCommand

This is useful if Git.status() is a long running command.

Change-Id: I6bdbf347a688043d549c1f091fb4a264a6c7024e
Signed-off-by: Christian Trutz <christian.trutz@gmail.com>
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years agoImplement open(URIish) for TransportLocal 25/14725/2
Robin Stocker [Sun, 21 Jul 2013 14:10:54 +0000 (16:10 +0200)]
Implement open(URIish) for TransportLocal

Can be used for listing remote refs for a repository on the file system
without having a local repository.

Bug: 413400
Change-Id: I397f5092c5eafb62236e9f9e74d9183f56903cc6
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
11 years agoFix NPE in openFetch on Transport without local repository 20/14720/3
Robin Stocker [Sat, 20 Jul 2013 14:26:05 +0000 (16:26 +0200)]
Fix NPE in openFetch on Transport without local repository

Setting the walk and other fields to null will result in NPEs when the
user e.g. calls fetch on the connection, but at least the advertised
refs can be read like that without having a local repository.

Bug: 413389
Change-Id: I39c8363e81a1c7e6cb3412ba88542ead669e69ed
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>