motiejus
/
jgit
1
Fork 0
Code Releases Activity

Rebase: fix wrong update if original HEAD after Merge+Skip 

Rebase would update the original HEAD to the wrong commit when
"skipping" the last commit after a merged commit.

Includes a test for the specific situation.

Change-Id: I087314b1834a3f11a4561f04ca5c21411d54d993
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
This commit is contained in:
Mathias Kinzler 2010-12-09 19:22:11 +01:00
parent 1783749e16
commit 2a7cd0086b
2 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
View File

@ -499,6 +499,44 @@ public void testStopOnLastConflictAndSkip() throws Exception {
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
}
public void testMergeFirstStopOnLastConflictAndSkip() throws Exception {
// create file1 on master
RevCommit firstInMaster = writeFileAndCommit(FILE1, "Add file1", "1",
"2", "3");
// change in master
writeFileAndCommit(FILE1, "change file1 in master", "1master", "2", "3");
checkFile(FILE1, "1master", "2", "3");
// create a topic branch based on the first commit
createBranch(firstInMaster, "refs/heads/topic");
checkoutBranch("refs/heads/topic");
// we have the old content again
checkFile(FILE1, "1", "2", "3");
// add a line (conflicting)
writeFileAndCommit(FILE1, "add a line to file1 in topic", "1topic",
"2", "3", "4topic");
// change first line (conflicting again)
writeFileAndCommit(FILE1,
"change file1 in topic\n\nThis is conflicting", "1topicagain",
"2", "3", "4topic");
RebaseResult res = git.rebase().setUpstream("refs/heads/master").call();
assertEquals(Status.STOPPED, res.getStatus());
writeFileAndAdd(FILE1, "merged");
res = git.rebase().setOperation(Operation.CONTINUE).call();
assertEquals(Status.STOPPED, res.getStatus());
res = git.rebase().setOperation(Operation.SKIP).call();
assertNotNull(res);
assertEquals(Status.OK, res.getStatus());
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
checkFile(FILE1, "merged");
}
public void testStopOnConflictAndSkipNoConflict() throws Exception {
// create file1 on master
RevCommit firstInMaster = writeFileAndCommit(FILE1, "Add file1", "1",

44
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
View File

@ -218,14 +218,12 @@ public RebaseResult call() throws NoHeadException, RefNotFoundException,
if (this.operation == Operation.CONTINUE)
newHead = continueRebase();
List<Step> steps = loadSteps();
if (this.operation == Operation.SKIP && !steps.isEmpty())
checkoutCurrentHead();
if (this.operation == Operation.SKIP)
newHead = checkoutCurrentHead();
ObjectReader or = repo.newObjectReader();
int stepsToPop = 0;
List<Step> steps = loadSteps();
for (Step step : steps) {
if (step.action != Action.PICK)
continue;
@ -250,22 +248,32 @@ public RebaseResult call() throws NoHeadException, RefNotFoundException,
if (newHead == null) {
return stop(commitToPick);
}
stepsToPop++;
}
if (newHead != null || steps.isEmpty()) {
if (newHead != null) {
// point the previous head (if any) to the new commit
String headName = readFile(rebaseDir, HEAD_NAME);
if (headName.startsWith(Constants.R_REFS)) {
RefUpdate rup = repo.updateRef(headName);
if (newHead != null) {
rup.setNewObjectId(newHead);
rup.forceUpdate();
rup.setNewObjectId(newHead);
Result res = rup.forceUpdate();
switch (res) {
case FAST_FORWARD:
case FORCED:
case NO_CHANGE:
break;
default:
throw new JGitInternalException("Updating HEAD failed");
}
rup = repo.updateRef(Constants.HEAD);
rup.link(headName);
}
if (this.operation == Operation.SKIP && steps.isEmpty()) {
checkoutCurrentHead();
res = rup.link(headName);
switch (res) {
case FAST_FORWARD:
case FORCED:
case NO_CHANGE:
break;
default:
throw new JGitInternalException("Updating HEAD failed");
}
}
FileUtils.delete(rebaseDir, FileUtils.RECURSIVE);
return new RebaseResult(Status.OK);
@ -276,8 +284,8 @@ public RebaseResult call() throws NoHeadException, RefNotFoundException,
}
}
private void checkoutCurrentHead() throws IOException, NoHeadException,
JGitInternalException {
private RevCommit checkoutCurrentHead() throws IOException,
NoHeadException, JGitInternalException {
ObjectId headTree = repo.resolve(Constants.HEAD + "^{tree}");
if (headTree == null)
throw new NoHeadException(
@ -299,6 +307,10 @@ private void checkoutCurrentHead() throws IOException, NoHeadException,
} finally {
dc.unlock();
}
RevWalk rw = new RevWalk(repo);
RevCommit commit = rw.parseCommit(repo.resolve(Constants.HEAD));
rw.release();
return commit;
}
/**