motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Set expected old object id to all zeros when head id is null"

This commit is contained in:
Shawn Pearce 2011-12-08 13:09:02 -05:00 committed by Code Review
parent 580def2a23 2539b1ee09
commit 4e92ae1656
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
View File

@ -228,7 +228,10 @@ public RevCommit call() throws NoHeadException, NoMessageException,
ru.setRefLogMessage( ru.setRefLogMessage(
prefix + revCommit.getShortMessage(), false); prefix + revCommit.getShortMessage(), false);
} }
if (headId != null)
ru.setExpectedOldObjectId(headId); ru.setExpectedOldObjectId(headId);
else
ru.setExpectedOldObjectId(ObjectId.zeroId());
Result rc = ru.forceUpdate(); Result rc = ru.forceUpdate();
switch (rc) { switch (rc) {
case NEW: case NEW: