From a7efca8bb40e9c0f85828d970f66e54f3a602466 Mon Sep 17 00:00:00 2001
From: "David Y. Ross" <dyross@gmail.com>
Date: Sat, 10 May 2014 20:50:20 -0700
Subject: [PATCH] append git hash to version for dev builds

---
 build/tasks/set-version-task.coffee | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/tasks/set-version-task.coffee b/build/tasks/set-version-task.coffee
index 630b57b2c..0b0d03699 100644
--- a/build/tasks/set-version-task.coffee
+++ b/build/tasks/set-version-task.coffee
@@ -7,14 +7,16 @@ module.exports = (grunt) ->
   getVersion = (callback) ->
     onBuildMachine = process.env.JANKY_SHA1 and process.env.JANKY_BRANCH is 'master'
     inRepository = fs.existsSync(path.resolve(__dirname, '..', '..', '.git'))
+    {version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json'))
     if onBuildMachine or not inRepository
-      {version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json'))
       callback(null, version)
     else
       cmd = 'git'
       args = ['rev-parse', '--short', 'HEAD']
       spawn {cmd, args}, (error, {stdout}={}, code) ->
-        callback(error, stdout?.trim?())
+        commitHash = stdout?.trim?()
+        combinedVersion = "#{version}-#{commitHash}"
+        callback(error, combinedVersion)
 
   grunt.registerTask 'set-version', 'Set the version in the plist and package.json', ->
     done = @async()