diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2014-07-20 12:29:38 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2014-07-20 12:33:56 -0700 |
| commit | cfc7bb35c237f60f52b32628098f5fb7b8a3d70b (patch) | |
| tree | dcde63a65cedd4918a2063b3c9d33b1221ac83c8 /Source/Core | |
| parent | 963e1a698cbeaa976a7f8e8020880a50267ecd69 (diff) | |
Windows: Also look for git.exe in the registry (for Git Extensions installs).
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/make_scmrev.h.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js index 501576e201..17e59a24bb 100644 --- a/Source/Core/Common/make_scmrev.h.js +++ b/Source/Core/Common/make_scmrev.h.js @@ -8,6 +8,15 @@ var cmd_branch = " rev-parse --abbrev-ref HEAD"; function GetGitExe() { + try + { + gitexe = wshShell.RegRead("HKCU\\Software\\GitExtensions\\gitcommand"); + wshShell.Exec(gitexe); + return gitexe; + } + catch (e) + {} + for (var gitexe in {"git.cmd":1, "git":1, "git.bat":1}) { try @@ -56,7 +65,7 @@ var gitexe = GetGitExe(); var revision = GetFirstStdOutLine(gitexe + cmd_revision); var describe = GetFirstStdOutLine(gitexe + cmd_describe); var branch = GetFirstStdOutLine(gitexe + cmd_branch); -var isMaster = +("master" == branch); +var isMaster = +("master" == branch); // remove hash (and trailing "-0" if needed) from description describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2'); |