File tree Expand file tree Collapse file tree 1 file changed +3
-1
lines changed Expand file tree Collapse file tree 1 file changed +3
-1
lines changed Original file line number Diff line number Diff line change 1
1
using System . CommandLine ;
2
2
using System . CommandLine . NamingConventionBinder ;
3
3
using System . Globalization ;
4
+ using System . Linq ;
4
5
using System . Text ;
5
6
using LibGit2Sharp ;
6
7
using Microsoft . TeamFoundation . SourceControl . WebApi ;
@@ -520,7 +521,8 @@ private static async IAsyncEnumerable<MappingState> EnumerateMappingStatesAsync(
520
521
keySelector : mappingByBranch => mappingByBranch . Branch ,
521
522
dependenciesSelector : mappingByBranch => additionalParents
522
523
. Where ( b => b . Branch == mappingByBranch . Branch )
523
- . Select ( b => b . ParentBranch ) )
524
+ . Select ( b => b . ParentBranch )
525
+ . Where ( branchMappings . ContainsKey ) ) // If the parent branch is also being deleted in the same commit, it doesn't affect the relative order
524
526
. ToImmutableArray ( ) ;
525
527
526
528
yield return new MappingState (
You can’t perform that action at this time.
0 commit comments