SimpleMergeTest: Clean up code style
Signed-off-by: Demetr Starshov <dstarshov@google.com> Change-Id: Ib0149279324a8b085eec4c60d02c8f32a8cc86bb
This commit is contained in:
parent
760cf0ba16
commit
0ec6e4b3d5
|
@ -109,33 +109,33 @@ public void testTrivialTwoWay_conflict() throws IOException {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testTrivialTwoWay_validSubtreeSort() throws Exception {
|
public void testTrivialTwoWay_validSubtreeSort() throws Exception {
|
||||||
final DirCache treeB = db.readDirCache();
|
DirCache treeB = db.readDirCache();
|
||||||
final DirCache treeO = db.readDirCache();
|
DirCache treeO = db.readDirCache();
|
||||||
final DirCache treeT = db.readDirCache();
|
DirCache treeT = db.readDirCache();
|
||||||
{
|
|
||||||
final DirCacheBuilder b = treeB.builder();
|
|
||||||
final DirCacheBuilder o = treeO.builder();
|
|
||||||
final DirCacheBuilder t = treeT.builder();
|
|
||||||
|
|
||||||
b.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
|
DirCacheBuilder bTreeBuilder = treeB.builder();
|
||||||
b.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
|
DirCacheBuilder oTreeBuilder = treeO.builder();
|
||||||
|
DirCacheBuilder tTreeBuilder = treeT.builder();
|
||||||
|
|
||||||
o.add(createEntry("Makefile", FileMode.REGULAR_FILE));
|
bTreeBuilder.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
|
||||||
o.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
|
bTreeBuilder.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
|
||||||
o.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
|
|
||||||
|
|
||||||
t.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
|
oTreeBuilder.add(createEntry("Makefile", FileMode.REGULAR_FILE));
|
||||||
t.add(createEntry("libelf/c", FileMode.REGULAR_FILE, "blah"));
|
oTreeBuilder.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
|
||||||
|
oTreeBuilder.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
|
||||||
|
|
||||||
b.finish();
|
tTreeBuilder.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
|
||||||
o.finish();
|
tTreeBuilder
|
||||||
t.finish();
|
.add(createEntry("libelf/c", FileMode.REGULAR_FILE, "blah"));
|
||||||
}
|
|
||||||
|
|
||||||
final ObjectInserter ow = db.newObjectInserter();
|
bTreeBuilder.finish();
|
||||||
final ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
oTreeBuilder.finish();
|
||||||
final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
tTreeBuilder.finish();
|
||||||
final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
|
||||||
|
ObjectInserter ow = db.newObjectInserter();
|
||||||
|
ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
||||||
|
ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
||||||
|
ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
||||||
|
|
||||||
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
||||||
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
||||||
|
@ -163,32 +163,31 @@ public void testTrivialTwoWay_validSubtreeSort() throws Exception {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testTrivialTwoWay_concurrentSubtreeChange() throws Exception {
|
public void testTrivialTwoWay_concurrentSubtreeChange() throws Exception {
|
||||||
final DirCache treeB = db.readDirCache();
|
DirCache treeB = db.readDirCache();
|
||||||
final DirCache treeO = db.readDirCache();
|
DirCache treeO = db.readDirCache();
|
||||||
final DirCache treeT = db.readDirCache();
|
DirCache treeT = db.readDirCache();
|
||||||
{
|
|
||||||
final DirCacheBuilder b = treeB.builder();
|
|
||||||
final DirCacheBuilder o = treeO.builder();
|
|
||||||
final DirCacheBuilder t = treeT.builder();
|
|
||||||
|
|
||||||
b.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
DirCacheBuilder bTreeBuilder = treeB.builder();
|
||||||
b.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
DirCacheBuilder oTreeBuilder = treeO.builder();
|
||||||
|
DirCacheBuilder tTreeBuilder = treeT.builder();
|
||||||
|
|
||||||
o.add(createEntry("d/o", FileMode.REGULAR_FILE, "o !"));
|
bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
o.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
||||||
|
|
||||||
t.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE, "o !"));
|
||||||
t.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
|
oTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
||||||
|
|
||||||
b.finish();
|
tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
o.finish();
|
tTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
|
||||||
t.finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
final ObjectInserter ow = db.newObjectInserter();
|
bTreeBuilder.finish();
|
||||||
final ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
oTreeBuilder.finish();
|
||||||
final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
tTreeBuilder.finish();
|
||||||
final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
|
||||||
|
ObjectInserter ow = db.newObjectInserter();
|
||||||
|
ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
||||||
|
ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
||||||
|
ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
||||||
|
|
||||||
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
||||||
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
||||||
|
@ -212,32 +211,31 @@ public void testTrivialTwoWay_concurrentSubtreeChange() throws Exception {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testTrivialTwoWay_conflictSubtreeChange() throws Exception {
|
public void testTrivialTwoWay_conflictSubtreeChange() throws Exception {
|
||||||
final DirCache treeB = db.readDirCache();
|
DirCache treeB = db.readDirCache();
|
||||||
final DirCache treeO = db.readDirCache();
|
DirCache treeO = db.readDirCache();
|
||||||
final DirCache treeT = db.readDirCache();
|
DirCache treeT = db.readDirCache();
|
||||||
{
|
|
||||||
final DirCacheBuilder b = treeB.builder();
|
|
||||||
final DirCacheBuilder o = treeO.builder();
|
|
||||||
final DirCacheBuilder t = treeT.builder();
|
|
||||||
|
|
||||||
b.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
DirCacheBuilder bTreeBuilder = treeB.builder();
|
||||||
b.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
DirCacheBuilder oTreeBuilder = treeO.builder();
|
||||||
|
DirCacheBuilder tTreeBuilder = treeT.builder();
|
||||||
|
|
||||||
o.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
o.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
|
bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
||||||
|
|
||||||
t.add(createEntry("d/o", FileMode.REGULAR_FILE, "t !"));
|
oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
t.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
|
oTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
|
||||||
|
|
||||||
b.finish();
|
tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE, "t !"));
|
||||||
o.finish();
|
tTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
|
||||||
t.finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
final ObjectInserter ow = db.newObjectInserter();
|
bTreeBuilder.finish();
|
||||||
final ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
oTreeBuilder.finish();
|
||||||
final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
tTreeBuilder.finish();
|
||||||
final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
|
||||||
|
ObjectInserter ow = db.newObjectInserter();
|
||||||
|
ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
||||||
|
ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
||||||
|
ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
||||||
|
|
||||||
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
||||||
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
||||||
|
@ -246,31 +244,30 @@ public void testTrivialTwoWay_conflictSubtreeChange() throws Exception {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testTrivialTwoWay_leftDFconflict1() throws Exception {
|
public void testTrivialTwoWay_leftDFconflict1() throws Exception {
|
||||||
final DirCache treeB = db.readDirCache();
|
DirCache treeB = db.readDirCache();
|
||||||
final DirCache treeO = db.readDirCache();
|
DirCache treeO = db.readDirCache();
|
||||||
final DirCache treeT = db.readDirCache();
|
DirCache treeT = db.readDirCache();
|
||||||
{
|
|
||||||
final DirCacheBuilder b = treeB.builder();
|
|
||||||
final DirCacheBuilder o = treeO.builder();
|
|
||||||
final DirCacheBuilder t = treeT.builder();
|
|
||||||
|
|
||||||
b.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
DirCacheBuilder bTreeBuilder = treeB.builder();
|
||||||
b.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
DirCacheBuilder oTreeBuilder = treeO.builder();
|
||||||
|
DirCacheBuilder tTreeBuilder = treeT.builder();
|
||||||
|
|
||||||
o.add(createEntry("d", FileMode.REGULAR_FILE));
|
bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
|
bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
||||||
|
|
||||||
t.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
oTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
|
||||||
t.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
|
|
||||||
|
|
||||||
b.finish();
|
tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
o.finish();
|
tTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
|
||||||
t.finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
final ObjectInserter ow = db.newObjectInserter();
|
bTreeBuilder.finish();
|
||||||
final ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
oTreeBuilder.finish();
|
||||||
final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
tTreeBuilder.finish();
|
||||||
final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
|
||||||
|
ObjectInserter ow = db.newObjectInserter();
|
||||||
|
ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
||||||
|
ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
||||||
|
ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
||||||
|
|
||||||
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
||||||
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
||||||
|
@ -279,31 +276,30 @@ public void testTrivialTwoWay_leftDFconflict1() throws Exception {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testTrivialTwoWay_rightDFconflict1() throws Exception {
|
public void testTrivialTwoWay_rightDFconflict1() throws Exception {
|
||||||
final DirCache treeB = db.readDirCache();
|
DirCache treeB = db.readDirCache();
|
||||||
final DirCache treeO = db.readDirCache();
|
DirCache treeO = db.readDirCache();
|
||||||
final DirCache treeT = db.readDirCache();
|
DirCache treeT = db.readDirCache();
|
||||||
{
|
|
||||||
final DirCacheBuilder b = treeB.builder();
|
|
||||||
final DirCacheBuilder o = treeO.builder();
|
|
||||||
final DirCacheBuilder t = treeT.builder();
|
|
||||||
|
|
||||||
b.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
DirCacheBuilder bTreeBuilder = treeB.builder();
|
||||||
b.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
DirCacheBuilder oTreeBuilder = treeO.builder();
|
||||||
|
DirCacheBuilder tTreeBuilder = treeT.builder();
|
||||||
|
|
||||||
o.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
o.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
|
bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
|
||||||
|
|
||||||
t.add(createEntry("d", FileMode.REGULAR_FILE));
|
oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
|
oTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
|
||||||
|
|
||||||
b.finish();
|
tTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
|
||||||
o.finish();
|
|
||||||
t.finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
final ObjectInserter ow = db.newObjectInserter();
|
bTreeBuilder.finish();
|
||||||
final ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
oTreeBuilder.finish();
|
||||||
final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
tTreeBuilder.finish();
|
||||||
final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
|
||||||
|
ObjectInserter ow = db.newObjectInserter();
|
||||||
|
ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
||||||
|
ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
||||||
|
ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
||||||
|
|
||||||
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
||||||
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
||||||
|
@ -312,29 +308,28 @@ public void testTrivialTwoWay_rightDFconflict1() throws Exception {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testTrivialTwoWay_leftDFconflict2() throws Exception {
|
public void testTrivialTwoWay_leftDFconflict2() throws Exception {
|
||||||
final DirCache treeB = db.readDirCache();
|
DirCache treeB = db.readDirCache();
|
||||||
final DirCache treeO = db.readDirCache();
|
DirCache treeO = db.readDirCache();
|
||||||
final DirCache treeT = db.readDirCache();
|
DirCache treeT = db.readDirCache();
|
||||||
{
|
|
||||||
final DirCacheBuilder b = treeB.builder();
|
|
||||||
final DirCacheBuilder o = treeO.builder();
|
|
||||||
final DirCacheBuilder t = treeT.builder();
|
|
||||||
|
|
||||||
b.add(createEntry("d", FileMode.REGULAR_FILE));
|
DirCacheBuilder bTreeBuilder = treeB.builder();
|
||||||
|
DirCacheBuilder oTreeBuilder = treeO.builder();
|
||||||
|
DirCacheBuilder tTreeBuilder = treeT.builder();
|
||||||
|
|
||||||
o.add(createEntry("d", FileMode.REGULAR_FILE, "o !"));
|
bTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
|
||||||
|
|
||||||
t.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
oTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE, "o !"));
|
||||||
|
|
||||||
b.finish();
|
tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
o.finish();
|
|
||||||
t.finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
final ObjectInserter ow = db.newObjectInserter();
|
bTreeBuilder.finish();
|
||||||
final ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
oTreeBuilder.finish();
|
||||||
final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
tTreeBuilder.finish();
|
||||||
final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
|
||||||
|
ObjectInserter ow = db.newObjectInserter();
|
||||||
|
ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
||||||
|
ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
||||||
|
ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
||||||
|
|
||||||
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
||||||
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
||||||
|
@ -343,29 +338,28 @@ public void testTrivialTwoWay_leftDFconflict2() throws Exception {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testTrivialTwoWay_rightDFconflict2() throws Exception {
|
public void testTrivialTwoWay_rightDFconflict2() throws Exception {
|
||||||
final DirCache treeB = db.readDirCache();
|
DirCache treeB = db.readDirCache();
|
||||||
final DirCache treeO = db.readDirCache();
|
DirCache treeO = db.readDirCache();
|
||||||
final DirCache treeT = db.readDirCache();
|
DirCache treeT = db.readDirCache();
|
||||||
{
|
|
||||||
final DirCacheBuilder b = treeB.builder();
|
|
||||||
final DirCacheBuilder o = treeO.builder();
|
|
||||||
final DirCacheBuilder t = treeT.builder();
|
|
||||||
|
|
||||||
b.add(createEntry("d", FileMode.REGULAR_FILE));
|
DirCacheBuilder bTreeBuilder = treeB.builder();
|
||||||
|
DirCacheBuilder oTreeBuilder = treeO.builder();
|
||||||
|
DirCacheBuilder tTreeBuilder = treeT.builder();
|
||||||
|
|
||||||
o.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
bTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
|
||||||
|
|
||||||
t.add(createEntry("d", FileMode.REGULAR_FILE, "t !"));
|
oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
|
||||||
|
|
||||||
b.finish();
|
tTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE, "t !"));
|
||||||
o.finish();
|
|
||||||
t.finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
final ObjectInserter ow = db.newObjectInserter();
|
bTreeBuilder.finish();
|
||||||
final ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
oTreeBuilder.finish();
|
||||||
final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
tTreeBuilder.finish();
|
||||||
final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
|
||||||
|
ObjectInserter ow = db.newObjectInserter();
|
||||||
|
ObjectId b = commit(ow, treeB, new ObjectId[] {});
|
||||||
|
ObjectId o = commit(ow, treeO, new ObjectId[] { b });
|
||||||
|
ObjectId t = commit(ow, treeT, new ObjectId[] { b });
|
||||||
|
|
||||||
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
|
||||||
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
|
||||||
|
@ -377,10 +371,9 @@ private static void assertCorrectId(DirCache treeT, TreeWalk tw) {
|
||||||
.getObjectId(0));
|
.getObjectId(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ObjectId commit(final ObjectInserter odi,
|
private static ObjectId commit(ObjectInserter odi, DirCache treeB,
|
||||||
final DirCache treeB,
|
ObjectId[] parentIds) throws Exception {
|
||||||
final ObjectId[] parentIds) throws Exception {
|
CommitBuilder c = new CommitBuilder();
|
||||||
final CommitBuilder c = new CommitBuilder();
|
|
||||||
c.setTreeId(treeB.writeTree(odi));
|
c.setTreeId(treeB.writeTree(odi));
|
||||||
c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", 1L, 0));
|
c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", 1L, 0));
|
||||||
c.setCommitter(c.getAuthor());
|
c.setCommitter(c.getAuthor());
|
||||||
|
|
Loading…
Reference in New Issue