opendev/gerrit
Code Issues Proposed changes

Merge "Skip also target branch history when using the %base option with push"

Browse Source
This commit is contained in:
Sasa Zivkov
2013-09-20 12:59:01 +00:00
committed by Gerrit Code Review
parent 759e9a042a 9f1db5860f
commit 68c9006a9c
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -1253,6 +1253,11 @@ public class ReceiveCommits {
walk.markStart(walk.parseCommit(magicBranch.cmd.getNewId()));
if (magicBranch.baseCommit != null) {
walk.markUninteresting(magicBranch.baseCommit);
assert magicBranch.ctl != null;
Ref targetRef = allRefs.get(magicBranch.ctl.getRefName());
if (targetRef != null) {
walk.markUninteresting(walk.parseCommit(targetRef.getObjectId()));
}
} else {
markHeadsAsUninteresting(
walk,