diff options
Diffstat (limited to 'org.eclipse.jgit')
6 files changed, 46 insertions, 40 deletions
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 4f6d874bf4..afb46a1e08 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,50 +2,50 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.api;version="3.1.0", - org.eclipse.jgit.api.errors;version="3.1.0", - org.eclipse.jgit.blame;version="3.1.0", - org.eclipse.jgit.diff;version="3.1.0", - org.eclipse.jgit.dircache;version="3.1.0", - org.eclipse.jgit.errors;version="3.1.0", - org.eclipse.jgit.events;version="3.1.0", - org.eclipse.jgit.fnmatch;version="3.1.0", - org.eclipse.jgit.ignore;version="3.1.0", - org.eclipse.jgit.internal;version="3.1.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.dfs;version="3.1.0";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.file;version="3.1.0"; +Export-Package: org.eclipse.jgit.api;version="3.1.1", + org.eclipse.jgit.api.errors;version="3.1.1", + org.eclipse.jgit.blame;version="3.1.1", + org.eclipse.jgit.diff;version="3.1.1", + org.eclipse.jgit.dircache;version="3.1.1", + org.eclipse.jgit.errors;version="3.1.1", + org.eclipse.jgit.events;version="3.1.1", + org.eclipse.jgit.fnmatch;version="3.1.1", + org.eclipse.jgit.ignore;version="3.1.1", + org.eclipse.jgit.internal;version="3.1.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.storage.dfs;version="3.1.1";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.storage.file;version="3.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, org.eclipse.jgit.http.server, org.eclipse.jgit.java7.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="3.1.0"; + org.eclipse.jgit.internal.storage.pack;version="3.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="3.1.0"; + org.eclipse.jgit.internal.storage.pack;version="3.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="3.1.0", - org.eclipse.jgit.merge;version="3.1.0", - org.eclipse.jgit.nls;version="3.1.0", - org.eclipse.jgit.notes;version="3.1.0", - org.eclipse.jgit.patch;version="3.1.0", - org.eclipse.jgit.revplot;version="3.1.0", - org.eclipse.jgit.revwalk;version="3.1.0", - org.eclipse.jgit.revwalk.filter;version="3.1.0", - org.eclipse.jgit.storage.file;version="3.1.0", - org.eclipse.jgit.storage.pack;version="3.1.0", - org.eclipse.jgit.submodule;version="3.1.0", - org.eclipse.jgit.transport;version="3.1.0", - org.eclipse.jgit.transport.resolver;version="3.1.0", - org.eclipse.jgit.treewalk;version="3.1.0", - org.eclipse.jgit.treewalk.filter;version="3.1.0", - org.eclipse.jgit.util;version="3.1.0", - org.eclipse.jgit.util.io;version="3.1.0" + org.eclipse.jgit.lib;version="3.1.1", + org.eclipse.jgit.merge;version="3.1.1", + org.eclipse.jgit.nls;version="3.1.1", + org.eclipse.jgit.notes;version="3.1.1", + org.eclipse.jgit.patch;version="3.1.1", + org.eclipse.jgit.revplot;version="3.1.1", + org.eclipse.jgit.revwalk;version="3.1.1", + org.eclipse.jgit.revwalk.filter;version="3.1.1", + org.eclipse.jgit.storage.file;version="3.1.1", + org.eclipse.jgit.storage.pack;version="3.1.1", + org.eclipse.jgit.submodule;version="3.1.1", + org.eclipse.jgit.transport;version="3.1.1", + org.eclipse.jgit.transport.resolver;version="3.1.1", + org.eclipse.jgit.treewalk;version="3.1.1", + org.eclipse.jgit.treewalk.filter;version="3.1.1", + org.eclipse.jgit.util;version="3.1.1", + org.eclipse.jgit.util.io;version="3.1.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 20968e8c76..10c561072b 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source;singleton:=true Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.0";roots="." +Bundle-Version: 3.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index ca0d73a662..88c387487c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 5a006792e1..a3f80c0f09 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -669,8 +669,8 @@ public class RebaseCommand extends GitCommand<RebaseResult> { BufferedWriter fw = new BufferedWriter(new OutputStreamWriter( new FileOutputStream(rebaseState.getFile(GIT_REBASE_TODO)), Constants.CHARACTER_ENCODING)); - fw.write("# Created by EGit: rebasing " + upstreamCommit.name() - + " onto " + headId.name()); + fw.write("# Created by EGit: rebasing " + headId.name() + " onto " + + upstreamCommit.name()); fw.newLine(); try { StringBuilder sb = new StringBuilder(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java index 7844fd819f..1525e5b187 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java @@ -70,8 +70,10 @@ public class BranchTrackingStatus { public static BranchTrackingStatus of(Repository repository, String branchName) throws IOException { + String shortBranchName = Repository.shortenRefName(branchName); + String fullBranchName = Constants.R_HEADS + shortBranchName; BranchConfig branchConfig = new BranchConfig(repository.getConfig(), - branchName); + shortBranchName); String trackingBranch = branchConfig.getTrackingBranch(); if (trackingBranch == null) @@ -81,7 +83,7 @@ public class BranchTrackingStatus { if (tracking == null) return null; - Ref local = repository.getRef(branchName); + Ref local = repository.getRef(fullBranchName); if (local == null) return null; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java index 382d162439..943ec4ec3f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java @@ -119,8 +119,12 @@ public class PlotCommitList<L extends PlotLane> extends setupChildren(currCommit); final int nChildren = currCommit.getChildCount(); - if (nChildren == 0) + if (nChildren == 0) { + currCommit.lane = nextFreeLane(); + activeLanes.add(currCommit.lane); + closeLane(currCommit.lane); return; + } if (nChildren == 1 && currCommit.children[0].getParentCount() < 2) { // Only one child, child has only us as their parent. |