From 2539b1ee096266b7fcca64545f93d7c08ab30f53 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 6 Dec 2011 18:02:30 -0800 Subject: [PATCH] Set expected old object id to all zeros when head id is null This will be the case on the initial commit to a repository and the ref update should expect a non-existent ref Change-Id: Iaa06e47e6e8cc4a0281c7683b367d4806dd980ea --- org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java index fc56f9af1..14a7494ba 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java @@ -228,7 +228,10 @@ public RevCommit call() throws NoHeadException, NoMessageException, ru.setRefLogMessage( prefix + revCommit.getShortMessage(), false); } - ru.setExpectedOldObjectId(headId); + if (headId != null) + ru.setExpectedOldObjectId(headId); + else + ru.setExpectedOldObjectId(ObjectId.zeroId()); Result rc = ru.forceUpdate(); switch (rc) { case NEW: