[eclipse-jgit] 01/05: Merge tag 'upstream/3.7.0'
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Mon May 4 17:03:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository eclipse-jgit.
commit 9342fb9b80e62fe2d3d47961dd393088a0da0dcd
Merge: 0017278 f22638f
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sun Apr 26 21:18:29 2015 +0200
Merge tag 'upstream/3.7.0'
Upstream version 3.7.0
.eclipse_iplog | 122 ---
.mailmap | 5 +
org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 12 +-
org.eclipse.jgit.ant.test/pom.xml | 2 +-
org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +-
org.eclipse.jgit.ant/pom.xml | 2 +-
org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 10 +-
.../META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.archive/pom.xml | 2 +-
org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 +-
org.eclipse.jgit.console/pom.xml | 2 +-
org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 10 +-
org.eclipse.jgit.http.apache/pom.xml | 2 +-
.../http/apache/HttpClientConnection.java | 6 +-
org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 25 +-
org.eclipse.jgit.http.server/pom.xml | 2 +-
org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 36 +-
org.eclipse.jgit.http.test/pom.xml | 2 +-
.../eclipse/jgit/http/test/ProtocolErrorTest.java | 2 +-
.../jgit/http/test/SmartClientSmartServerTest.java | 5 +
org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF | 23 +-
org.eclipse.jgit.java7.test/pom.xml | 2 +-
.../src/org/eclipse/jgit/util/FSJava7Test.java | 78 +-
.../src/org/eclipse/jgit/util/HookTest.java | 136 +++
org.eclipse.jgit.java7/META-INF/MANIFEST.MF | 4 +-
org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.java7/pom.xml | 6 +-
.../src/org/eclipse/jgit/util/FS_POSIX_Java7.java | 190 ++++-
.../eclipse/jgit/util/FS_Win32_Java7Cygwin.java | 18 +
.../src/org/eclipse/jgit/util/FileUtil.java | 8 +
org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 +-
org.eclipse.jgit.junit.http/pom.xml | 2 +-
org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 30 +-
org.eclipse.jgit.junit/pom.xml | 2 +-
.../jgit/junit/LocalDiskRepositoryTestCase.java | 2 +-
.../org/eclipse/jgit/junit/MockSystemReader.java | 3 +
.../org.eclipse.jgit.feature/feature.xml | 30 +-
.../org.eclipse.jgit.feature/pom.xml | 2 +-
.../feature.xml | 2 +-
.../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +-
.../org.eclipse.jgit.java7.feature/feature.xml | 2 +-
.../org.eclipse.jgit.java7.feature/pom.xml | 2 +-
.../org.eclipse.jgit.junit.feature/feature.xml | 2 +-
.../org.eclipse.jgit.junit.feature/pom.xml | 2 +-
.../org.eclipse.jgit.pgm.feature/feature.xml | 4 +-
.../org.eclipse.jgit.pgm.feature/pom.xml | 2 +-
.../feature.xml | 2 +-
.../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +-
.../org.eclipse.jgit.repository/pom.xml | 2 +-
.../org.eclipse.jgit.source.feature/feature.xml | 2 +-
.../org.eclipse.jgit.source.feature/pom.xml | 2 +-
.../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.jgit.target/jgit-4.3.target | 37 +-
.../org.eclipse.jgit.target/jgit-4.3.tpd | 8 +
.../org.eclipse.jgit.target/jgit-4.4.target | 35 +-
.../org.eclipse.jgit.target/jgit-4.4.tpd | 8 +
.../{jgit-4.3.target => jgit-4.5.target} | 37 +-
.../org.eclipse.jgit.target/jgit-4.5.tpd | 8 +
.../orbit/R20150124073747-Luna-SR2.tpd | 39 +
.../orbit/S20150202203538-Mars-M5.tpd | 39 +
.../org.eclipse.jgit.target/pom.xml | 2 +-
.../projects/jetty-7.6.14.tpd | 20 +
org.eclipse.jgit.packaging/pom.xml | 17 +-
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 34 +-
org.eclipse.jgit.pgm.test/pom.xml | 2 +-
.../tst/org/eclipse/jgit/pgm/CheckoutTest.java | 12 +
.../tst/org/eclipse/jgit/pgm/CloneTest.java | 156 ++++
.../tst/org/eclipse/jgit/pgm/LsRemoteTest.java | 138 ++++
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 62 +-
org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.pgm/jgit.sh | 8 +-
org.eclipse.jgit.pgm/pom.xml | 10 +-
.../eclipse/jgit/pgm/internal/CLIText.properties | 7 +
.../src/org/eclipse/jgit/pgm/Checkout.java | 9 +-
.../src/org/eclipse/jgit/pgm/Clone.java | 152 +---
.../src/org/eclipse/jgit/pgm/Diff.java | 2 +-
.../src/org/eclipse/jgit/pgm/Fetch.java | 2 +-
.../src/org/eclipse/jgit/pgm/Gc.java | 13 +-
.../src/org/eclipse/jgit/pgm/IndexPack.java | 2 +-
.../src/org/eclipse/jgit/pgm/LsRemote.java | 40 +-
.../src/org/eclipse/jgit/pgm/Push.java | 2 +-
.../eclipse/jgit/pgm/debug/RebuildCommitGraph.java | 2 +-
.../src/org/eclipse/jgit/pgm/internal/CLIText.java | 2 +
org.eclipse.jgit.test/META-INF/MANIFEST.MF | 79 +-
.../eclipse/jgit/patch/EGitPatchHistoryTest.java | 2 +-
org.eclipse.jgit.test/pom.xml | 2 +-
.../org/eclipse/jgit/api/ArchiveCommandTest.java | 12 +-
.../org/eclipse/jgit/api/CheckoutCommandTest.java | 48 +-
.../tst/org/eclipse/jgit/api/CloneCommandTest.java | 73 +-
.../org/eclipse/jgit/api/CommitCommandTest.java | 4 +-
.../tst/org/eclipse/jgit/api/InitCommandTest.java | 110 +++
.../eclipse/jgit/api/PathCheckoutCommandTest.java | 34 +
.../tst/org/eclipse/jgit/api/ResetCommandTest.java | 15 +
.../eclipse/jgit/attributes/AttributeNodeTest.java | 182 +++++
.../org/eclipse/jgit/attributes/AttributeTest.java | 43 +-
.../AttributesMatcherTest.java} | 123 +--
.../AttributesNodeDirCacheIteratorTest.java | 296 +++++++
.../AttributesNodeWorkingTreeIteratorTest.java | 282 +++++++
.../tst/org/eclipse/jgit/diff/RawTextTest.java | 7 +
.../org/eclipse/jgit/diff/SimilarityIndexTest.java | 62 +-
.../eclipse/jgit/dircache/DirCacheBasicTest.java | 46 +-
.../jgit/dircache/DirCacheBuilderIteratorTest.java | 2 +-
.../eclipse/jgit/dircache/DirCacheBuilderTest.java | 6 +-
.../dircache/DirCacheCGitCompatabilityTest.java | 2 +-
.../eclipse/jgit/dircache/DirCacheEntryTest.java | 8 +-
.../eclipse/jgit/dircache/DirCacheFindTest.java | 10 +-
.../jgit/dircache/DirCacheIteratorTest.java | 24 +-
.../jgit/dircache/DirCachePathEditTest.java | 8 +-
.../eclipse/jgit/dircache/DirCacheTreeTest.java | 6 +-
.../org/eclipse/jgit/gitrepo/RepoCommandTest.java | 458 ++++++-----
.../tst/org/eclipse/jgit/ignore/BasicRuleTest.java | 42 +-
.../eclipse/jgit/ignore/FastIgnoreRuleTest.java | 563 +++++++++++++
...est.java => IgnoreMatcherParametrizedTest.java} | 282 ++++---
.../org/eclipse/jgit/ignore/IgnoreMatcherTest.java | 9 +-
.../org/eclipse/jgit/ignore/IgnoreNodeTest.java | 213 ++++-
.../jgit/ignore/IgnoreRuleSpecialCasesTest.java | 907 +++++++++++++++++++++
.../internal/storage/file/GcBasicPackingTest.java | 53 +-
.../internal/storage/file/StoredBitmapTest.java | 6 +-
.../tst/org/eclipse/jgit/lib/ConfigTest.java | 17 +
.../lib/DirCacheCheckoutMaliciousPathTest.java | 10 +-
.../org/eclipse/jgit/lib/DirCacheCheckoutTest.java | 32 +
.../eclipse/jgit/lib/IndexDiffSubmoduleTest.java | 213 +++++
.../org/eclipse/jgit/lib/ObjectCheckerTest.java | 247 +++++-
.../eclipse/jgit/lib/T0001_PersonIdentTest.java | 12 +
.../eclipse/jgit/revwalk/RevWalkShallowTest.java | 8 +-
.../eclipse/jgit/submodule/SubmoduleAddTest.java | 9 +-
.../eclipse/jgit/submodule/SubmoduleSyncTest.java | 4 +-
.../jgit/submodule/SubmoduleUpdateTest.java | 2 +-
.../eclipse/jgit/submodule/SubmoduleWalkTest.java | 12 +-
.../eclipse/jgit/transport/BundleWriterTest.java | 27 +-
.../jgit/transport/SideBandOutputStreamTest.java | 6 +-
.../jgit/treewalk/FileTreeIteratorTest.java | 43 +-
.../jgit/treewalk/filter/PathFilterGroupTest.java | 2 +-
.../org/eclipse/jgit/util/ChangeIdUtilTest.java | 4 +
.../tst/org/eclipse/jgit/util/FileUtilTest.java | 68 ++
.../org/eclipse/jgit/util/TemporaryBufferTest.java | 24 +-
org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-
org.eclipse.jgit.ui/pom.xml | 2 +-
.../org/eclipse/jgit/awtui/AWTPlotRenderer.java | 8 +-
org.eclipse.jgit/.settings/.api_filters | 9 +
org.eclipse.jgit/META-INF/MANIFEST.MF | 100 ++-
org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit/pom.xml | 11 +-
.../org/eclipse/jgit/internal/JGitText.properties | 16 +-
.../src/org/eclipse/jgit/api/CheckoutCommand.java | 18 +-
.../org/eclipse/jgit/api/CherryPickCommand.java | 3 +-
.../src/org/eclipse/jgit/api/CloneCommand.java | 69 +-
.../src/org/eclipse/jgit/api/CommitCommand.java | 71 +-
.../src/org/eclipse/jgit/api/DescribeCommand.java | 27 +-
.../eclipse/jgit/api/GarbageCollectCommand.java | 98 ++-
.../src/org/eclipse/jgit/api/GitCommand.java | 7 +-
.../src/org/eclipse/jgit/api/InitCommand.java | 88 +-
.../src/org/eclipse/jgit/api/RebaseCommand.java | 12 +-
.../src/org/eclipse/jgit/api/ReflogCommand.java | 4 +
.../src/org/eclipse/jgit/api/ResetCommand.java | 3 +
.../org/eclipse/jgit/api/StashApplyCommand.java | 10 +-
.../src/org/eclipse/jgit/api/StatusCommand.java | 15 +
.../org/eclipse/jgit/api/SubmoduleAddCommand.java | 11 +
.../eclipse/jgit/api/SubmoduleUpdateCommand.java | 3 +
.../jgit/api/errors/RejectCommitException.java | 29 +-
.../src/org/eclipse/jgit/attributes/Attribute.java | 184 +++++
.../AttributesNode.java} | 91 ++-
.../eclipse/jgit/attributes/AttributesRule.java | 203 +++++
.../org/eclipse/jgit/attributes/package-info.java | 4 +
.../src/org/eclipse/jgit/diff/DiffFormatter.java | 8 +-
.../src/org/eclipse/jgit/diff/RawText.java | 2 +-
.../src/org/eclipse/jgit/diff/SimilarityIndex.java | 64 +-
.../src/org/eclipse/jgit/dircache/DirCache.java | 25 +-
.../eclipse/jgit/dircache/DirCacheCheckout.java | 146 ++--
.../org/eclipse/jgit/dircache/DirCacheEntry.java | 53 +-
.../eclipse/jgit/dircache/DirCacheIterator.java | 64 ++
.../org/eclipse/jgit/dircache/DirCacheTree.java | 2 +-
.../src/org/eclipse/jgit/gitrepo/RepoCommand.java | 10 +-
.../org/eclipse/jgit/ignore/FastIgnoreRule.java | 215 +++++
.../src/org/eclipse/jgit/ignore/IgnoreNode.java | 76 +-
.../src/org/eclipse/jgit/ignore/IgnoreRule.java | 11 +-
.../jgit/ignore/internal/AbstractMatcher.java | 52 +-
.../org/eclipse/jgit/ignore/internal/IMatcher.java | 80 +-
.../ignore/internal/LeadingAsteriskMatcher.java | 49 +-
.../eclipse/jgit/ignore/internal/NameMatcher.java | 112 +++
.../eclipse/jgit/ignore/internal/PathMatcher.java | 255 ++++++
.../org/eclipse/jgit/ignore/internal/Strings.java | 404 +++++++++
.../ignore/internal/TrailingAsteriskMatcher.java | 48 +-
.../jgit/ignore/internal/WildCardMatcher.java | 38 +-
.../eclipse/jgit/ignore/internal/WildMatcher.java | 41 +-
.../src/org/eclipse/jgit/internal/JGitText.java | 12 +-
.../jgit/internal/storage/dfs/DfsPackFile.java | 2 +-
.../jgit/internal/storage/dfs/DfsReader.java | 6 +-
.../internal/storage/dfs/InMemoryRepository.java | 13 +
.../jgit/internal/storage/file/FileRepository.java | 22 +-
.../jgit/internal/storage/file/FileSnapshot.java | 18 +-
.../org/eclipse/jgit/internal/storage/file/GC.java | 18 +-
.../internal/storage/file/ObjectDirectory.java | 54 +-
.../jgit/internal/storage/file/PackFile.java | 10 +-
.../jgit/internal/storage/file/PackIndexV1.java | 7 +-
.../jgit/internal/storage/file/WindowCursor.java | 8 +-
.../jgit/internal/storage/pack/PackWriter.java | 57 +-
.../eclipse/jgit/lib/BaseRepositoryBuilder.java | 6 +-
.../src/org/eclipse/jgit/lib/ConfigConstants.java | 67 +-
.../src/org/eclipse/jgit/lib/Constants.java | 37 +-
.../src/org/eclipse/jgit/lib/CoreConfig.java | 13 +
.../src/org/eclipse/jgit/lib/IndexDiff.java | 166 +++-
.../src/org/eclipse/jgit/lib/ObjectChecker.java | 173 +++-
.../src/org/eclipse/jgit/lib/PersonIdent.java | 4 +-
.../src/org/eclipse/jgit/lib/RebaseTodoFile.java | 13 +-
.../src/org/eclipse/jgit/lib/RefDatabase.java | 9 +
.../src/org/eclipse/jgit/lib/Repository.java | 11 +-
.../src/org/eclipse/jgit/lib/UserConfig.java | 17 +-
.../src/org/eclipse/jgit/merge/ResolveMerger.java | 36 +-
.../src/org/eclipse/jgit/patch/FileHeader.java | 7 +-
.../src/org/eclipse/jgit/patch/Patch.java | 12 +-
.../eclipse/jgit/revplot/AbstractPlotRenderer.java | 8 +-
.../src/org/eclipse/jgit/revwalk/RevWalk.java | 49 +-
.../org/eclipse/jgit/submodule/SubmoduleWalk.java | 70 ++
.../src/org/eclipse/jgit/transport/AmazonS3.java | 8 +-
.../jgit/transport/BasePackFetchConnection.java | 2 +-
.../eclipse/jgit/transport/BaseReceivePack.java | 72 +-
.../jgit/transport/BundleFetchConnection.java | 2 +-
.../org/eclipse/jgit/transport/BundleWriter.java | 3 +-
.../jgit/transport/GitProtocolConstants.java | 15 +
.../src/org/eclipse/jgit/transport/PackParser.java | 3 +-
.../org/eclipse/jgit/transport/ReceivePack.java | 7 +
.../org/eclipse/jgit/transport/RefAdvertiser.java | 23 +
.../jgit/transport/SideBandOutputStream.java | 4 +-
.../org/eclipse/jgit/transport/TransferConfig.java | 35 +-
.../src/org/eclipse/jgit/transport/Transport.java | 33 +-
.../eclipse/jgit/transport/TransportAmazonS3.java | 6 +-
.../src/org/eclipse/jgit/transport/UploadPack.java | 12 +-
.../jgit/transport/WalkFetchConnection.java | 2 +-
.../eclipse/jgit/treewalk/WorkingTreeIterator.java | 193 ++++-
.../src/org/eclipse/jgit/util/ChangeIdUtil.java | 2 +
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 381 ++++++++-
.../src/org/eclipse/jgit/util/FS_POSIX.java | 14 +
.../src/org/eclipse/jgit/util/FS_Win32_Cygwin.java | 23 +
.../src/org/eclipse/jgit/util/FileUtils.java | 66 ++
.../src/org/eclipse/jgit/util/Hook.java | 149 ++++
.../src/org/eclipse/jgit/util/ProcessResult.java | 96 ++-
.../src/org/eclipse/jgit/util/SystemReader.java | 49 +-
.../src/org/eclipse/jgit/util/TemporaryBuffer.java | 9 +-
pom.xml | 35 +-
240 files changed, 9746 insertions(+), 1823 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-jgit.git
More information about the pkg-java-commits
mailing list