[eclipse-jgit] 01/03: Merge tag 'upstream/3.2.0'
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Mon Dec 23 19:11:34 UTC 2013
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 d3a0c2cd361f4a05593b131a3ac8fa8d42d8c548
Merge: 00a0015 8167367
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Mon Dec 23 19:16:02 2013 +0100
Merge tag 'upstream/3.2.0'
Upstream version 3.2.0
org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 12 +-
org.eclipse.jgit.ant.test/pom.xml | 2 +-
.../eclipse/jgit/ant/tasks/GitCloneTaskTest.java | 4 +-
org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 7 +-
org.eclipse.jgit.ant/pom.xml | 4 +-
org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 12 +-
.../META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.archive/pom.xml | 2 +-
.../src/org/eclipse/jgit/archive/TarFormat.java | 7 +-
.../src/org/eclipse/jgit/archive/ZipFormat.java | 7 +-
org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 +-
org.eclipse.jgit.console/build.properties | 3 +-
org.eclipse.jgit.console/pom.xml | 2 +-
org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 29 +-
org.eclipse.jgit.http.server/build.properties | 3 +-
org.eclipse.jgit.http.server/pom.xml | 2 +-
.../jgit/http/server/GitSmartHttpTools.java | 6 +-
.../eclipse/jgit/http/server/InfoRefsServlet.java | 3 +-
org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 32 +-
org.eclipse.jgit.http.test/pom.xml | 2 +-
.../eclipse/jgit/http/test/FileResolverTest.java | 2 +-
org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF | 17 +-
org.eclipse.jgit.java7.test/pom.xml | 4 +-
.../src/org/eclipse/jgit/util/FSJava7Test.java | 8 +-
org.eclipse.jgit.java7/META-INF/MANIFEST.MF | 6 +-
org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.java7/pom.xml | 2 +-
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 +-
.../src/org/eclipse/jgit/junit/JGitTestUtil.java | 35 +-
.../jgit/junit/LocalDiskRepositoryTestCase.java | 2 +
.../org/eclipse/jgit/junit/RepositoryTestCase.java | 22 +-
.../org.eclipse.jgit.feature/feature.xml | 2 +-
.../org.eclipse.jgit.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 +-
....eclipse.jgit.target.target => jgit-4.3.target} | 38 +-
....eclipse.jgit.target.target => jgit-4.4.target} | 46 +-
.../org.eclipse.jgit.target/pom.xml | 31 +-
org.eclipse.jgit.packaging/pom.xml | 38 +-
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 28 +-
org.eclipse.jgit.pgm.test/build.properties | 3 +-
org.eclipse.jgit.pgm.test/pom.xml | 2 +-
.../tst/org/eclipse/jgit/pgm/CheckoutTest.java | 26 +
.../tst/org/eclipse/jgit/pgm/DescribeTest.java | 72 +-
.../tst/org/eclipse/jgit/pgm/FetchTest.java | 106 +-
.../tst/org/eclipse/jgit/pgm/StatusTest.java | 118 ++
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 77 +-
org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-
.../services/org.eclipse.jgit.pgm.TextBuiltin | 1 +
org.eclipse.jgit.pgm/build.properties | 4 +-
org.eclipse.jgit.pgm/pom.xml | 2 +-
.../eclipse/jgit/pgm/internal/CLIText.properties | 10 +-
.../src/org/eclipse/jgit/pgm/Branch.java | 4 +-
.../src/org/eclipse/jgit/pgm/Checkout.java | 7 +
.../jgit/pgm/{RevParse.java => Describe.java} | 46 +-
.../src/org/eclipse/jgit/pgm/Fetch.java | 14 +
.../src/org/eclipse/jgit/pgm/Main.java | 10 +-
.../src/org/eclipse/jgit/pgm/RevParse.java | 4 +-
.../org/eclipse/jgit/pgm/RevWalkTextBuiltin.java | 9 +-
.../src/org/eclipse/jgit/pgm/ShowRef.java | 6 +-
.../src/org/eclipse/jgit/pgm/Status.java | 125 +-
.../src/org/eclipse/jgit/pgm/Version.java | 51 +-
.../eclipse/jgit/pgm/debug/RebuildCommitGraph.java | 7 +-
.../src/org/eclipse/jgit/pgm/internal/CLIText.java | 4 +
org.eclipse.jgit.test/META-INF/MANIFEST.MF | 71 +-
org.eclipse.jgit.test/pom.xml | 2 +-
.../tst/org/eclipse/jgit/api/ApplyCommandTest.java | 13 +-
.../org/eclipse/jgit/api/BranchCommandTest.java | 2 +-
.../tst/org/eclipse/jgit/api/CloneCommandTest.java | 36 +-
.../tst/org/eclipse/jgit/api/CommitOnlyTest.java | 5 -
.../org/eclipse/jgit/api/DescribeCommandTest.java | 248 ++++
.../jgit/api/GarbageCollectCommandTest.java | 11 +-
.../org/eclipse/jgit/api/GitConstructionTest.java | 28 +
.../org/eclipse/jgit/api/LsRemoteCommandTest.java | 12 +-
.../tst/org/eclipse/jgit/api/MergeCommandTest.java | 40 +-
.../tst/org/eclipse/jgit/api/PullCommandTest.java | 5 +-
.../jgit/api/PullCommandWithRebaseTest.java | 2 +-
.../org/eclipse/jgit/api/RebaseCommandTest.java | 1454 ++++++++++++++++++--
.../tst/org/eclipse/jgit/api/Sets.java | 29 +-
.../eclipse/jgit/api/StashApplyCommandTest.java | 87 ++
.../org/eclipse/jgit/api/StatusCommandTest.java | 33 +-
.../org/eclipse/jgit/ignore/IgnoreMatcherTest.java | 12 +
.../storage/file/FileRepositoryBuilderTest.java | 6 +-
.../internal/storage/file/FileSnapshotTest.java | 9 +-
.../eclipse/jgit/internal/storage/file/GCTest.java | 741 ----------
.../internal/storage/file/GcBasicPackingTest.java | 162 +++
.../internal/storage/file/GcBranchPrunedTest.java | 119 ++
.../internal/storage/file/GcConcurrentTest.java | 119 ++
.../storage/file/GcDirCacheSavesObjectsTest.java} | 72 +-
.../internal/storage/file/GcKeepFilesTest.java | 109 +-
.../jgit/internal/storage/file/GcPackRefsTest.java | 180 +++
.../storage/file/GcPruneNonReferencedTest.java | 120 ++
.../jgit/internal/storage/file/GcReflogTest.java | 146 ++
.../jgit/internal/storage/file/GcTagTest.java | 53 +-
.../jgit/internal/storage/file/GcTestCase.java | 98 +-
.../jgit/internal/storage/file/PackWriterTest.java | 2 +-
.../jgit/internal/storage/file/RefUpdateTest.java | 2 +-
.../internal/storage/file/ReflogReaderTest.java | 2 +-
.../internal/storage/file/T0003_BasicTest.java | 2 +-
.../storage/file/T0004_PackReaderTest.java | 22 +-
.../internal/storage/file/WindowCacheGetTest.java | 2 +-
.../tst/org/eclipse/jgit/lib/ConfigTest.java | 63 +-
.../lib/DirCacheCheckoutMaliciousPathTest.java | 13 +-
.../org/eclipse/jgit/lib/DirCacheCheckoutTest.java | 25 +
.../tst/org/eclipse/jgit/lib/RefTest.java | 2 +-
.../org/eclipse/jgit/lib/RepositoryCacheTest.java | 30 +-
.../eclipse/jgit/lib/RepositoryResolveTest.java | 2 +-
.../tst/org/eclipse/jgit/lib/T0002_TreeTest.java | 2 +-
.../jgit/merge/MergeMessageFormatterTest.java | 2 +-
.../org/eclipse/jgit/merge/SimpleMergeTest.java | 2 +-
.../jgit/merge/SquashMessageFormatterTest.java | 2 +-
.../org/eclipse/jgit/revwalk/RevFlagSetTest.java | 1 -
.../jgit/storage/file/FileBasedConfigTest.java | 11 +-
.../eclipse/jgit/submodule/SubmoduleWalkTest.java | 11 +-
.../resources}/SampleDataRepositoryTestCase.java | 13 +-
.../eclipse/jgit/transport/BundleWriterTest.java | 2 +-
.../eclipse/jgit/transport/PushProcessTest.java | 2 +-
.../org/eclipse/jgit/transport/TransportTest.java | 4 +-
.../tst/org/eclipse/jgit/util/FileUtilTest.java | 7 +-
.../eclipse/jgit/util/GitDateFormatterTest.java | 6 +
.../jgit/util/GitDateParserBadlyFormattedTest.java | 20 +-
.../org/eclipse/jgit/util/GitDateParserTest.java | 45 +-
.../jgit/util/RelativeDateFormatterTest.java | 6 +
.../jgit/util/io/AutoCRLFInputStreamTest.java | 4 +-
.../jgit/util/io/AutoCRLFOutputStreamTest.java | 12 +-
.../tst/org/eclipse/jgit/util/io/Strings.java | 30 +-
org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-
org.eclipse.jgit.ui/pom.xml | 2 +-
org.eclipse.jgit/META-INF/MANIFEST.MF | 145 +-
org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit/pom.xml | 2 +-
.../org/eclipse/jgit/internal/JGitText.properties | 8 +
.../src/org/eclipse/jgit/api/AddCommand.java | 12 +-
.../src/org/eclipse/jgit/api/ArchiveCommand.java | 4 +-
.../src/org/eclipse/jgit/api/BlameCommand.java | 3 +-
.../src/org/eclipse/jgit/api/CheckoutCommand.java | 7 +-
.../src/org/eclipse/jgit/api/CleanCommand.java | 2 +-
.../src/org/eclipse/jgit/api/CommitCommand.java | 8 +-
.../src/org/eclipse/jgit/api/DescribeCommand.java | 285 ++++
org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java | 31 +
.../src/org/eclipse/jgit/api/LogCommand.java | 12 +-
.../src/org/eclipse/jgit/api/MergeCommand.java | 6 +-
.../src/org/eclipse/jgit/api/RebaseCommand.java | 884 +++++++-----
.../src/org/eclipse/jgit/api/RebaseResult.java | 115 +-
.../src/org/eclipse/jgit/api/ResetCommand.java | 9 +-
.../src/org/eclipse/jgit/api/RevertCommand.java | 4 +-
.../src/org/eclipse/jgit/api/RmCommand.java | 3 +-
.../org/eclipse/jgit/api/StashApplyCommand.java | 16 +-
.../org/eclipse/jgit/api/StashCreateCommand.java | 3 +
.../src/org/eclipse/jgit/api/Status.java | 44 +-
.../src/org/eclipse/jgit/api/StatusCommand.java | 3 +-
.../org/eclipse/jgit/api/SubmoduleAddCommand.java | 1 +
.../org/eclipse/jgit/api/SubmoduleInitCommand.java | 1 +
.../eclipse/jgit/api/SubmoduleStatusCommand.java | 1 +
.../org/eclipse/jgit/api/SubmoduleSyncCommand.java | 1 +
.../eclipse/jgit/api/SubmoduleUpdateCommand.java | 1 +
.../api/errors/InvalidRebaseStepException.java | 62 +
.../eclipse/jgit/dircache/DirCacheCheckout.java | 67 +-
.../jgit/dircache/InvalidPathException.java | 6 +-
.../IllegalTodoFileModification.java} | 22 +-
.../src/org/eclipse/jgit/ignore/IgnoreRule.java | 1 +
.../src/org/eclipse/jgit/internal/JGitText.java | 8 +
.../jgit/internal/storage/dfs/DfsBlockCache.java | 4 +
.../internal/storage/dfs/DfsGarbageCollector.java | 3 +-
.../jgit/internal/storage/dfs/DfsPackFile.java | 2 +-
.../jgit/internal/storage/file/FileRepository.java | 4 +-
.../org/eclipse/jgit/internal/storage/file/GC.java | 66 +-
.../eclipse/jgit/lib/BaseRepositoryBuilder.java | 10 +-
.../src/org/eclipse/jgit/lib/Config.java | 33 +-
.../src/org/eclipse/jgit/lib/ConfigConstants.java | 15 +
.../src/org/eclipse/jgit/lib/ConfigSnapshot.java | 14 +-
.../src/org/eclipse/jgit/lib/ObjectDatabase.java | 7 +-
.../src/org/eclipse/jgit/lib/ObjectReader.java | 18 +-
.../src/org/eclipse/jgit/lib/RebaseTodoFile.java | 242 ++++
.../src/org/eclipse/jgit/lib/RebaseTodoLine.java | 277 ++++
.../src/org/eclipse/jgit/lib/Repository.java | 45 +-
.../src/org/eclipse/jgit/merge/Merger.java | 29 +-
.../org/eclipse/jgit/merge/StrategyOneSided.java | 5 +
.../src/org/eclipse/jgit/merge/ThreeWayMerger.java | 21 +-
.../jgit/transport/BasePackFetchConnection.java | 33 +-
.../jgit/transport/BasePackPushConnection.java | 8 +-
.../eclipse/jgit/transport/BaseReceivePack.java | 8 +-
.../jgit/transport/BundleFetchConnection.java | 10 +-
.../jgit/transport/GitProtocolConstants.java | 166 +++
.../org/eclipse/jgit/transport/ReceivePack.java | 2 +-
.../transport/ServiceMayNotContinueException.java | 26 +
.../src/org/eclipse/jgit/transport/Transport.java | 7 +-
.../org/eclipse/jgit/transport/TransportHttp.java | 12 +-
.../src/org/eclipse/jgit/transport/UploadPack.java | 41 +-
.../jgit/transport/WalkFetchConnection.java | 11 +-
.../src/org/eclipse/jgit/util/GitDateParser.java | 92 +-
.../src/org/eclipse/jgit/util/SystemReader.java | 18 +-
.../org/eclipse/jgit/util/io/MessageWriter.java | 3 +-
pom.xml | 4 +-
tools/maven-central/deploy.rb | 61 +
tools/maven-central/download.rb | 30 +
209 files changed, 6459 insertions(+), 2276 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