File tree Expand file tree Collapse file tree 1 file changed +22
-0
lines changed
src/GitVersionCore.Tests/IntegrationTests Expand file tree Collapse file tree 1 file changed +22
-0
lines changed Original file line number Diff line number Diff line change @@ -272,6 +272,28 @@ public void VerifyMergingMasterIntoAFeatureBranchWorksWithMultipleBranches()
272
272
fixture . AssertFullSemver ( config , "1.0.2" ) ;
273
273
}
274
274
}
275
+
276
+ [ Test ]
277
+ public void VerifyPullRequestVersionAfterBranchingFromTaggedMergeCommit ( )
278
+ {
279
+ using ( var fixture = new EmptyRepositoryFixture ( ) )
280
+ {
281
+ fixture . MakeACommit ( "first in master" ) ;
282
+
283
+ fixture . BranchTo ( "feature/foo" , "foo" ) ;
284
+ fixture . MakeACommit ( "first in foo" ) ;
285
+
286
+ fixture . Checkout ( "master" ) ;
287
+ fixture . MergeNoFF ( "feature/foo" ) ;
288
+ fixture . ApplyTag ( "1.0.0" ) ;
289
+
290
+ fixture . BranchTo ( "feature/bar" , "bar" ) ;
291
+ fixture . MakeACommit ( "first in bar" ) ;
292
+ fixture . AssertFullSemver ( "1.0.1-bar.1+1" ) ;
293
+ fixture . Repository . CreatePullRequestRef ( "feature/bar" , "master" , normalise : false ) ;
294
+ fixture . AssertFullSemver ( config , "1.0.1-PullRequest0002.2" ) ;
295
+ }
296
+ }
275
297
}
276
298
277
299
static class CommitExtensions
You can’t perform that action at this time.
0 commit comments