Merge pull request #509 from github/fixes/branch-validation-incomplete

shana · web-flow · commit 2712ff72cda2 · 2016-08-19T14:01:39.000+02:00
Fix branch comparison in PR creation
diff --git a/src/GitHub.App/ViewModels/PullRequestCreationViewModel.cs b/src/GitHub.App/ViewModels/PullRequestCreationViewModel.cs
@@ -165,7 +165,7 @@ void SetupValidators()
 
             BranchValidator = ReactivePropertyValidator.ForObservable(branchObs)
                 .IfTrue(x => x.Source == null, Resources.PullRequestSourceBranchDoesNotExist)
-                .IfTrue(x => x.Source.Name == x.Target.Name, Resources.PullRequestSourceAndTargetBranchTheSame);
+                .IfTrue(x => x.Source.Equals(x.Target), Resources.PullRequestSourceAndTargetBranchTheSame);
         }
 
         bool disposed; // To detect redundant calls

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ void SetupValidators()`
`165`	`165`
`166`	`166`	`BranchValidator = ReactivePropertyValidator.ForObservable(branchObs)`
`167`	`167`	`.IfTrue(x => x.Source == null, Resources.PullRequestSourceBranchDoesNotExist)`
`168`		`- .IfTrue(x => x.Source.Name == x.Target.Name, Resources.PullRequestSourceAndTargetBranchTheSame);`
	`168`	`+ .IfTrue(x => x.Source.Equals(x.Target), Resources.PullRequestSourceAndTargetBranchTheSame);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`bool disposed; // To detect redundant calls`