]> source.dussan.org Git - jgit.git/commit
Update ORIG_HEAD when resetting 40/6140/5
authorKevin Sawicki <kevin@github.com>
Thu, 10 May 2012 22:56:21 +0000 (15:56 -0700)
committerRobin Rosenberg <robin.rosenberg@dewire.com>
Thu, 31 May 2012 19:52:31 +0000 (21:52 +0200)
commit058c74d8adcfb5ef0eed203a64b7f9ff65e87c8c
tree50046b907a23fc800fea35858f6b861e3ea6c8b1
parent9bd9d9a698a0f2adf858b5dd25d44db9af9a84d4
Update ORIG_HEAD when resetting

Write the old object id from the RefUpdate to the
ORIG_HEAD file after the update completes.

Add two new convenience methods to Repository to read
and write the ORIG_HEAD reference similar to the methods
for reading/writing CHERRY_PICK_HEAD and MERGE_HEAD.

Bug: 375525
Change-Id: I120b3b2cd3b1ddae88fce435285bae15cbf96f5e
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java