Browse Source

Fix CommitCommand amend mode to preserve parent order

Change-Id: I476921ff8dfa6a357932d42ee59340873502b582
stable-3.0
Shawn Pearce 12 years ago
parent
commit
1f51aecf95
  1. 5
      org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java

5
org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java

@ -184,9 +184,8 @@ public class CommitCommand extends GitCommand<RevCommit> {
if (amend) {
RevCommit previousCommit = new RevWalk(repo)
.parseCommit(headId);
RevCommit[] p = previousCommit.getParents();
for (int i = 0; i < p.length; i++)
parents.add(0, p[i].getId());
for (RevCommit p : previousCommit.getParents())
parents.add(p.getId());
if (author == null)
author = previousCommit.getAuthorIdent();
} else {

Loading…
Cancel
Save