Skip to content

Commit 83203a8

Browse files
committed
Integrat code review remarks
1 parent 84c4ab3 commit 83203a8

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public virtual IEnumerable<IBaseVersionIncrement> GetIncrements(
1616
context.BaseVersionSource = commit.Value;
1717

1818
var incrementForcedByBranch = iteration.Configuration.Increment == IncrementStrategy.Inherit
19-
? commit.GetIncrementForcedByBranch(context.Configuration) : iteration.Configuration.Increment.ToVersionField();
19+
? commit.GetIncrementForcedByBranch(context.Configuration)
20+
: iteration.Configuration.Increment.ToVersionField();
2021
context.Increment = context.Increment.Consolidate(incrementForcedByBranch);
2122

2223
var iterationEffectiveConfiguration = iteration.GetEffectiveConfiguration(context.Configuration);

src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedBase.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ internal abstract class CommitOnTrunkBranchedBase : ITrunkBasedIncrementer
77
{
88
public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
99
=> commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch
10-
&& commit.BranchName != iteration.BranchName && commit.Successor is null;
10+
&& commit.BranchName != iteration.BranchName
11+
&& commit.Successor is null;
1112

1213
public virtual IEnumerable<IBaseVersionIncrement> GetIncrements(
1314
TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
@@ -22,7 +23,8 @@ public virtual IEnumerable<IBaseVersionIncrement> GetIncrements(
2223
}
2324

2425
var incrementForcedByBranch = iteration.Configuration.Increment == IncrementStrategy.Inherit
25-
? commit.GetIncrementForcedByBranch(context.Configuration) : iteration.Configuration.Increment.ToVersionField();
26+
? commit.GetIncrementForcedByBranch(context.Configuration)
27+
: iteration.Configuration.Increment.ToVersionField();
2628
context.Increment = incrementForcedByBranch;
2729

2830
var iterationEffectiveConfiguration = iteration.GetEffectiveConfiguration(context.Configuration);

0 commit comments

Comments
 (0)