diff options
| -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) |