commit 5001038f521f7624068bd1e03e0b816fd32d9ef3
author Shawn Pearce <spearce@spearce.org> Wed Jan 06 15:18:02 2016 -0500
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Wed Jan 06 15:18:04 2016 -0500
tree e2a3f9077a037d265a9c0b22aa71ea9ac34c0516
parent f0d634eed764f8ff228ece18c6960375e90e6958
parent 4c9eda17bea2a5f9c2d4905d2a9e43cc832a432d

Merge "InMemoryRepository: Abort BatchRefUpdate if a command previously failed"

org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java
index cdebb7a..205d3c7 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java
@@ -310,6 +310,11 @@ private void batch(RevWalk walk, List<ReceiveCommand> cmds) {
 			Map<ObjectId, ObjectId> peeled = new HashMap<>();
 			try (RevWalk rw = new RevWalk(getRepository())) {
 				for (ReceiveCommand c : cmds) {
+					if (c.getResult() != ReceiveCommand.Result.NOT_ATTEMPTED) {
+						reject(cmds);
+						return;
+					}
+
 					if (!ObjectId.zeroId().equals(c.getNewId())) {
 						try {
 							RevObject o = rw.parseAny(c.getNewId());