opendev
/
gerrit
Code Issues Proposed changes

Remove redundant parent specifications 

TestRepository#branch automatically adds the specified branch tip to
the parents of the resulting CommitBuilder. Adding the parent after
that results in a merge commit with two of the same parent--valid, but
not something we're specifically trying to test.

Change-Id: If656de877269f90a63375bb22db72544e5f55c4a
This commit is contained in:
Dave Borowitz 2015-05-13 18:35:17 -07:00
parent 781f1311bd
commit a537be8fc7
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
View File

@ -55,7 +55,6 @@ public class SubmoduleSubscriptionsWholeTopicMergeIT
RevCommit c1 = subRepo.branch("HEAD").commit().insertChangeId()
.message("first change")
.add("asdf", "asdf\n")
.parent(c)
.create();
subRepo.git().push().setRemote("origin")
.setRefSpecs(new RefSpec("HEAD:refs/for/master/" + name("topic-foo")))
@ -65,13 +64,11 @@ public class SubmoduleSubscriptionsWholeTopicMergeIT
RevCommit c2 = subRepo.branch("HEAD").commit().insertChangeId()
.message("qwerty")
.add("qwerty", "qwerty")
.parent(c)
.create();
RevCommit c3 = subRepo.branch("HEAD").commit().insertChangeId()
.message("qwerty followup")
.add("qwerty", "qwerty\nqwerty\n")
.parent(c2)
.create();
subRepo.git().push().setRemote("origin")
.setRefSpecs(new RefSpec("HEAD:refs/for/master/" + name("topic-foo")))