diff options
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/ObjectFilter.java | 16 |
2 files changed, 12 insertions, 6 deletions
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 62001d0a78..82444ba609 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -1227,7 +1227,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { RefUpdate rup = repo.updateRef(headName); rup.setExpectedOldObjectId(oldCommit); rup.setNewObjectId(newCommit); - rup.setRefLogMessage("Fast-foward from " + oldCommit.name() //$NON-NLS-1$ + rup.setRefLogMessage("Fast-forward from " + oldCommit.name() //$NON-NLS-1$ + " to " + newCommit.name(), false); //$NON-NLS-1$ Result res = rup.update(walk); switch (res) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/ObjectFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/ObjectFilter.java index 44ebb9c60d..2ad273d9ec 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/ObjectFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/ObjectFilter.java @@ -47,7 +47,6 @@ import java.io.IOException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; -import org.eclipse.jgit.errors.StopWalkException; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.revwalk.ObjectWalk; @@ -74,12 +73,19 @@ public abstract class ObjectFilter { * Determine if the named object should be included in the walk. * * @param walker - * the active walker this filter is being invoked from within. + * the active walker this filter is being invoked from within. * @param objid - * the object currently being tested. + * the object currently being tested. + * @return {@code true} if the named object should be included in the walk. + * @throws MissingObjectException + * an object the filter needed to consult to determine its + * answer was missing + * @throws IncorrectObjectTypeException + * an object the filter needed to consult to determine its + * answer was of the wrong type * @throws IOException - * an object the filter needed to consult to determine its answer - * was missing, of the wrong type, or could not be read. + * an object the filter needed to consult to determine its + * answer could not be read. */ public abstract boolean include(ObjectWalk walker, AnyObjectId objid) throws MissingObjectException, IncorrectObjectTypeException, |