From a537be8fc79bb79eb54054218bd04005b70f69b8 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Wed, 13 May 2015 18:35:17 -0700 Subject: [PATCH] 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 --- .../git/SubmoduleSubscriptionsWholeTopicMergeIT.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java index 85037f1461..af428364c9 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java @@ -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")))