diff options
| author | Chris Aniszczyk | 2011-01-19 08:06:07 +0000 |
|---|---|---|
| committer | Code Review | 2011-01-19 08:06:07 +0000 |
| commit | 27cbe0b50ac8fd91d161bd10caea009c134c9672 (patch) | |
| tree | 54537c1bce6df6268a9ae9ff67449bcb55fcda0a | |
| parent | e2a5f29eb1da0f7aa9daa6563b3d06c4a078bc3b (diff) | |
| parent | 9a14f8fc0648eca351c486689ebffe5020c52f52 (diff) | |
| download | egit-27cbe0b50ac8fd91d161bd10caea009c134c9672.tar.gz egit-27cbe0b50ac8fd91d161bd10caea009c134c9672.tar.xz egit-27cbe0b50ac8fd91d161bd10caea009c134c9672.zip | |
Merge "Fix IndexOutOfBoundException in GitModelObjectContainer"
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObjectContainer.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObjectContainer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObjectContainer.java index 2f25decbff..a92071451d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObjectContainer.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObjectContainer.java @@ -228,7 +228,11 @@ public abstract class GitModelObjectContainer extends GitModelObject implements objBaseId = ObjectId.zeroId(); ObjectId objRemoteId = tw.getObjectId(actualNth); - ObjectId objAncestorId = tw.getObjectId(ancestorNth); + ObjectId objAncestorId; + if (ancestorNth > -1) + objAncestorId = tw.getObjectId(ancestorNth); + else + objAncestorId = ObjectId.zeroId(); int objectType = tw.getFileMode(actualNth).getObjectType(); if (objectType == Constants.OBJ_BLOB) |