From 4cce5c2cf7ff8168fd361ef5a0329994a760d2ae Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Wed, 24 Jun 2015 21:44:03 -0500
Subject: [PATCH] get (and use) shorthash

---
 BizHawk.Client.EmuHawk/AboutBox.cs |   4 ++--
 BizHawk.Client.EmuHawk/BizBox.cs   |   4 ++--
 Build/BizHawk.Build.Tool.exe       | Bin 9216 -> 9216 bytes
 Build/BizHawk.Build.Tool/Tool.cs   |   8 ++++++++
 Version/svnrev_template            |   1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/AboutBox.cs b/BizHawk.Client.EmuHawk/AboutBox.cs
index cf51d75e5e..0aec2ff897 100644
--- a/BizHawk.Client.EmuHawk/AboutBox.cs
+++ b/BizHawk.Client.EmuHawk/AboutBox.cs
@@ -160,9 +160,9 @@ namespace BizHawk.Client.EmuHawk
         private void AboutBox_Load(object sender, EventArgs e)
         {
 #if DEBUG
-					Text = "BizHawk Developer Build (DEBUG MODE) GIT " + SubWCRev.GIT_BRANCH + "-"+SubWCRev.SVN_REV;
+					Text = "BizHawk Developer Build (DEBUG MODE) GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH;
 #else
-			Text = "BizHawk Developer Build (RELEASE MODE) GIT " + SubWCRev.GIT_BRANCH + "-"+SubWCRev.SVN_REV;
+			Text = "BizHawk Developer Build (RELEASE MODE) GIT " + SubWCRev.GIT_BRANCH + "-"+SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH;
 #endif
 					if (DateTime.Now.Month == 12)
 				if (DateTime.Now.Day > 17 && DateTime.Now.Day <= 25)
diff --git a/BizHawk.Client.EmuHawk/BizBox.cs b/BizHawk.Client.EmuHawk/BizBox.cs
index f267d86646..cbef7d3edc 100644
--- a/BizHawk.Client.EmuHawk/BizBox.cs
+++ b/BizHawk.Client.EmuHawk/BizBox.cs
@@ -28,11 +28,11 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (VersionInfo.DeveloperBuild)
 			{
-				Text = " BizHawk  (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + ")";
+				Text = " BizHawk  (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH + ")";
 			}
 			else
 			{
-				Text = "Version " + VersionInfo.MAINVERSION + " (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + ")";
+				Text = "Version " + VersionInfo.MAINVERSION + " (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH + ")";
 			}
 
 			VersionLabel.Text = "Version " + VersionInfo.MAINVERSION + " " + VersionInfo.RELEASEDATE;
diff --git a/Build/BizHawk.Build.Tool.exe b/Build/BizHawk.Build.Tool.exe
index 8102768f1100d906924f991ae0756a8f1e1d5cec..2bf586054b3dcd83ed19ea64246ca01bfb5f36ed 100644
GIT binary patch
delta 987
zcma)5O-NKx6#m|unfEi!yz$Pp8D}QU(J>#^GcAKg3bcZ>77hMXLKqtT7}^XEm(mj{
zs6d(F(MAZOrMr0HBCM6rq84r16iB<4xr!)|&YkBdBtrLbf4+0h{mysKyLWzIexUqV
zp14<e+9co4S5~eV4SC=ysPzF_sFLMwR=Oe2rrZVTL34qeq76`&5yC?gDAxlL;V_`M
zuhLy!LGB4jYwjcUWT2kayKmKWb^fBJ9m19t(A$#NqRSEJfu*UfAQ#3bs@XvlTuE@%
zCbkmS{7IJ+TapOreI^pyO#zfl3Q%~Mg{vXvQQEj2WX%99oLp2%5@(Dhl$VT|Q4wCp
z>XOc)(8}X1o;cL|oW+Zl$QfbuElnlImU)y#?H<bD6K8~%OlGH8sMs*L0cM!T2m%{I
z&#69fbo=a%su+vyQPrCkL0~Z_v#ZR$NP9?KQb=sH3qDHOll~%YPy34<^>NkgqQtdw
zy!I*gXPm1smTQcY&Oem)3K@#syR23aI1*%aTw}5QnOAGf?`q8J|3~Z)vrd)UTSunY
z--v_Gc%0M}Ptd>>GH#NQX}een64tk|#uU?_e~XU(9#IY81NH0F+o|B>f#zRL+$5|^
z&@nCh4tG;8q;hoH*3n^<DU>b-S}%+ao~QYRHx@o1%X6kzihPu!j?{@(e4;Uf_uioK
zS?^G%QN$e}WT6{U#)5_0WU(=W3C!XQTF{2OG)it$<KfOsj-J#x4AZ;0j3JEB++RgG
z%7*3dZ*srJ*Do!u{`or8ZvON}8gEIFl*$dm(5l^CPdV|^+iy>785is3N;V-E@|A3Z
WyO3V<jDx>Jaw+ezmLF23OZ^M&9Hf;1

delta 780
zcmZuvO=uHA6n-;F_OHn_ucMp4QWK+g(WXX?5ONYJntCdgYNZ9C;Gs}S*^{6&Q4myU
z=(6-uP((cy^s?YV)RWYUU<JL1R0I+6;>ClA6yM~h3U!v5dB5NL-n?y88`Y&7yfo$A
z8sK-z-s%}KQU*8+w2lE75ickG96Qe+B>ih_A=@CQT2<N{BJg{V<TwB$-2%}3tC?aj
z#!C@4>R;E7hI+Brf2OBf_j^5EC%s^V%)N=p*h&=4P;+)OES2%5?(8QBso7F@32j~)
z+}>o$S6NmS-GLCyJLJ)%iDoOr8KR6%P~jo~nu$f7xX3uhZS5Y$otO%@&`K;SjuPvL
z_O8lp#9BcW>p}XOvx##nGKx{RL>1b=8RaFDGpqz1HiV1;#+-ws0&FNg<<Biv$G2Ds
z6x&!;o~s~0k!cgFD`xH~${}_MMKS4)wY8Kx(-zY1TwB;;-={l8D%|aK>M!1Z;I4Gx
zmb!2qTm@Hey@tC=uG*o0Aj1F$!e~i@n%mwgYVKpoAR31$r*?!6sgZGwjA(Rp12sp`
za|4YLSifrf1x#m|AWWLtG<#@r;a{@GQXfJ9`H9m|rEnSx<WEkFj?g_Be6n_O{$nus
z8GXfK3v3wj@S4sHtOakxJJVlJ?u!p4zka!V|Ko`#Gmq@Z%eUWxJ*f+<C#m-dAq=(s
t<#b)bT<1qsJeo?*dO4dn%3f}VKc0E&XLIX;=>HYrcgq3p{?5Fj{s$q6iv|Dy

diff --git a/Build/BizHawk.Build.Tool/Tool.cs b/Build/BizHawk.Build.Tool/Tool.cs
index 2409d360fa..8a8c7894ab 100644
--- a/Build/BizHawk.Build.Tool/Tool.cs
+++ b/Build/BizHawk.Build.Tool/Tool.cs
@@ -94,6 +94,9 @@ namespace BizHawk.Build.Tool
 			//pick branch unnamed in case investigation fails (or isnt git)
 			string branch = "";
 
+			//pick no hash in case investigation fails (or isnt git)
+			string shorthash = "";
+
 			//try to find an SVN or GIT and run it
 			if (svn)
 			{
@@ -127,6 +130,10 @@ namespace BizHawk.Build.Tool
 							output = RunTool(gittool, "-C", wcdir, "rev-parse", "--abbrev-ref", "HEAD");
 							if(output.StartsWith("fatal")) {}
 							else branch = output;
+
+							output = RunTool(gittool, "-C", wcdir, "log", "-1", "--format=\"%h\"");
+							if (output.StartsWith("fatal")) { }
+							else shorthash = output;
 						}
 					}
 					catch (Exception ex)
@@ -139,6 +146,7 @@ namespace BizHawk.Build.Tool
 			//replace the template and dump the results if needed
 			templateContents = templateContents.Replace("$WCREV$", rev.ToString());
 			templateContents = templateContents.Replace("$WCBRANCH$", branch);
+			templateContents = templateContents.Replace("$WCSHORTHASH$", shorthash);
 			WriteTextIfChanged(outfile, templateContents);
 		}
 	}
diff --git a/Version/svnrev_template b/Version/svnrev_template
index 570e7ddc2e..81b5b7f67c 100644
--- a/Version/svnrev_template
+++ b/Version/svnrev_template
@@ -2,4 +2,5 @@ static class SubWCRev
 {
 	public const string SVN_REV = "$WCREV$";
 	public const string GIT_BRANCH = "$WCBRANCH$";
+	public const string GIT_SHORTHASH = "$WCSHORTHASH$";
 }