diff options
author | Roberto Tyley <roberto.tyley@gmail.com> | 2014-01-29 00:01:53 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2014-02-13 17:45:41 -0500 |
commit | 47f47ffc07e00109dc069e111274252e4053a599 (patch) | |
tree | 10c20429f3a49659ec2abce381fd835a2f501972 /org.eclipse.jgit.test/tst | |
parent | 420cb50cc2eeaaa85cc06f605c7a61fa4798a04e (diff) | |
download | jgit-47f47ffc07e00109dc069e111274252e4053a599.tar.gz jgit-47f47ffc07e00109dc069e111274252e4053a599.zip |
Initialise ReceiveCommand status to NOT_ATTEMPTED for all constructors
Formerly the 4-arg constructor did not do this, which was unfortunate
as that constructor's the only way for an external user of JGit to set
the /type/ of the ref-update - which you might want to do to indicate
that the update is expected to be a UPDATE_NONFASTFORWARD, and thus does
not require expensive isMergedInto() calculations:
http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02258.html
Change-Id: I84c5e4927131e105bed93e31a62da6367c78de32
Signed-off-by: Roberto Tyley <roberto.tyley@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst')
-rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java index a821e948e7..87b9176368 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java @@ -1278,10 +1278,8 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase { private static ReceiveCommand newCommand(RevCommit a, RevCommit b, String string, Type update) { - ReceiveCommand ret = new ReceiveCommand(a != null ? a.getId() : null, + return new ReceiveCommand(a != null ? a.getId() : null, b != null ? b.getId() : null, string, update); - ret.setResult(ReceiveCommand.Result.NOT_ATTEMPTED); - return ret; } private void writeLooseRef(String name, AnyObjectId id) throws IOException { |