updated version

reignstudios · Mar 29, 2017 · f9037b3 · f9037b3
1 parent eb3579d
commit f9037b3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/GitCommander/Branches.cs b/GitCommander/Branches.cs
@@ -290,22 +290,38 @@ public static bool MergeBranchIntoActive(string branch)
 
 		public static bool IsUpToDateWithRemote(string remote, string branch, out bool yes)
 		{
+			// check for changes not in sync
 			yes = true;
 			bool isUpToDate = true;
-			var stdCallback = new StdCallbackMethod(delegate(string line)
+			var stdCallback_log = new StdCallbackMethod(delegate(string line)
 			{
-				//var match = Regex.Match(line, @"Your branch is ahead of '(.*)' by (\d*) commit.");
 				var match = Regex.Match(line, @"commit (.*)");
 				if (match.Success) isUpToDate = false;
 			});
-
-			//var result = Tools.RunExe("git", "status", stdCallback:stdCallback);
-			var result = Tools.RunExe("git", string.Format("log {0}/{1}..{1}", remote, branch), stdCallback:stdCallback);
+
+			var result = Tools.RunExe("git", string.Format("log {0}/{1}..{1}", remote, branch), stdCallback:stdCallback_log);
 			lastResult = result.Item1;
 			lastError = result.Item2;
-
 			yes = isUpToDate;
+			//if (!string.IsNullOrEmpty(lastError)) return false;
+			//else if (!isUpToDate) return true;
 			return string.IsNullOrEmpty(lastError);
+
+			// if git log doesn't pick up anything try status
+			/*var stdCallback_status = new StdCallbackMethod(delegate(string line)
+			{
+				var match = Regex.Match(line, @"Your branch is ahead of '(.*)' by (\d*) commit.");
+				if (match.Success) isUpToDate = false;
+
+				match = Regex.Match(line, @"Your branch is behind '(.*)' by (\d*) commits");
+				if (match.Success) isUpToDate = false;
+			});
+
+			result = Tools.RunExe("git", "status", stdCallback:stdCallback_status);
+			lastResult = result.Item1;
+			lastError = result.Item2;
+			yes = isUpToDate;
+			return string.IsNullOrEmpty(lastError);*/
 		}
 	}
 }
diff --git a/GitItGUI.Core/Properties/AssemblyInfo.cs b/GitItGUI.Core/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@
 
 public static class VersionInfo
 {
-	public const string version = "0.2.3";
+	public const string version = "0.2.4";
 	#if DEBUG
 	public const string versionType = version + "b";
 	#else

diff --git a/GitItGUI/VersionInfo.xml b/GitItGUI/VersionInfo.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <VersionInfo>
-	<AppVersion>0.2.3</AppVersion>
+	<AppVersion>0.2.4</AppVersion>
 </VersionInfo>
diff --git a/Installer/Git-It-GUI_Installer.aip b/Installer/Git-It-GUI_Installer.aip
@@ -13,10 +13,10 @@
     <ROW Property="ARPURLUPDATEINFO" Value="https://github.com/reignstudios/Git-It-GUI/releases"/>
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="Manufacturer" Value="Reign-Studios"/>
-    <ROW Property="ProductCode" Value="1033:{537D8294-66A1-485B-AA23-05AEA45B81BA} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{0BE6ABA4-D424-4D83-BB12-E271EFEE9154} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Git-It-GUI"/>
-    <ROW Property="ProductVersion" Value="0.2.3" Type="32"/>
+    <ROW Property="ProductVersion" Value="0.2.4" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{FD4A5E78-F668-42CE-90BC-D1DDAA792189}"/>