motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Fix CommitCommand to be able to skip writing to RefLog"

This commit is contained in:
Matthias Sohn 2016-04-11 16:50:10 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent ccf8363693 36a53d1a3c
commit eeeca8042f
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
View File

@ -68,6 +68,7 @@
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.RefUpdate.Result;
import org.eclipse.jgit.lib.ReflogEntry;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit;
@ -436,6 +437,36 @@ public void commitAfterSquashMerge() throws Exception {
}
}
@Test
public void testReflogs() throws Exception {
try (Git git = new Git(db)) {
writeTrashFile("f", "1");
git.add().addFilepattern("f").call();
git.commit().setMessage("c1").call();
writeTrashFile("f", "2");
git.commit().setMessage("c2").setAll(true).setReflogComment(null)
.call();
writeTrashFile("f", "3");
git.commit().setMessage("c3").setAll(true)
.setReflogComment("testRl").call();
db.getReflogReader(Constants.HEAD).getReverseEntries();
assertEquals("testRl;commit (initial): c1;", reflogComments(
db.getReflogReader(Constants.HEAD).getReverseEntries()));
assertEquals("testRl;commit (initial): c1;", reflogComments(
db.getReflogReader(db.getBranch()).getReverseEntries()));
}
}
private static String reflogComments(List<ReflogEntry> entries) {
StringBuffer b = new StringBuffer();
for (ReflogEntry e : entries) {
b.append(e.getComment()).append(";");
}
return b.toString();
}
@Test(expected = WrongRepositoryStateException.class)
public void commitAmendOnInitialShouldFail() throws Exception {
try (Git git = new Git(db)) {

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

@ -124,6 +124,8 @@ public class CommitCommand extends GitCommand<RevCommit> {
private String reflogComment;
private boolean useDefaultReflogMessage = true;
/**
* Setting this option bypasses the pre-commit and commit-msg hooks.
*/
@ -258,7 +260,7 @@ public RevCommit call() throws GitAPIException, NoHeadException,
RevCommit revCommit = rw.parseCommit(commitId);
RefUpdate ru = repo.updateRef(Constants.HEAD);
ru.setNewObjectId(commitId);
if (reflogComment != null) {
if (!useDefaultReflogMessage) {
ru.setRefLogMessage(reflogComment, false);
} else {
String prefix = amend ? "commit (amend): " //$NON-NLS-1$
@ -790,10 +792,13 @@ public CommitCommand setInsertChangeId(boolean insertChangeId) {
* Override the message written to the reflog
*
* @param reflogComment
* the comment to be written into the reflog or <code>null</code>
* to specify that no reflog should be written
* @return {@code this}
*/
public CommitCommand setReflogComment(String reflogComment) {
this.reflogComment = reflogComment;
useDefaultReflogMessage = false;
return this;
}