Improvements after code review for #208

GeertvanHorrik · GeertvanHorrik · commit 105eeebd3410 · 2014-07-08T15:48:05.000+02:00
diff --git a/GitVersionCore/SemanticVersionExtensions.cs b/GitVersionCore/SemanticVersionExtensions.cs
@@ -10,9 +10,12 @@ public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version,
             var manualNextVersion = nextVersionTxtFileFinder.GetNextVersion();
             if (!manualNextVersion.IsEmpty())
             {
-                version.Major = manualNextVersion.Major;
-                version.Minor = manualNextVersion.Minor;
-                version.Patch = manualNextVersion.Patch;
+                if (manualNextVersion > version)
+                {
+                    version.Major = manualNextVersion.Major;
+                    version.Minor = manualNextVersion.Minor;
+                    version.Patch = manualNextVersion.Patch;
+                }
             }
         }
     }
diff --git a/GitVersionExe/GitPreparer.cs b/GitVersionExe/GitPreparer.cs
@@ -74,7 +74,6 @@ string GetGitInfoFromUrl()
                         repository.Refs.UpdateTarget("HEAD", targetBranchName);
                     }
 
-                    // TODO: Are there other files?
                     repository.CheckoutFilesIfExist("NextVersion.txt");
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,12 @@ public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version,`
`10`	`10`	`var manualNextVersion = nextVersionTxtFileFinder.GetNextVersion();`
`11`	`11`	`if (!manualNextVersion.IsEmpty())`
`12`	`12`	`{`
`13`		`- version.Major = manualNextVersion.Major;`
`14`		`- version.Minor = manualNextVersion.Minor;`
`15`		`- version.Patch = manualNextVersion.Patch;`
	`13`	`+ if (manualNextVersion > version)`
	`14`	`+ {`
	`15`	`+ version.Major = manualNextVersion.Major;`
	`16`	`+ version.Minor = manualNextVersion.Minor;`
	`17`	`+ version.Patch = manualNextVersion.Patch;`
	`18`	`+ }`
`16`	`19`	`}`
`17`	`20`	`}`
`18`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ string GetGitInfoFromUrl()`
`74`	`74`	`repository.Refs.UpdateTarget("HEAD", targetBranchName);`
`75`	`75`	`}`
`76`	`76`
`77`		`- // TODO: Are there other files?`
`78`	`77`	`repository.CheckoutFilesIfExist("NextVersion.txt");`
`79`	`78`	`}`
`80`	`79`	`}`