Merge pull request #1865 from ipfs/fix/makefile-sha

jbenet · jbenet · commit dbeebe87a81b · 2015-10-19T15:56:37.000-07:00
fix makefile failing when not in a git repo
diff --git a/cmd/ipfs/Makefile b/cmd/ipfs/Makefile
@@ -1,5 +1,5 @@
 all: install
-commit = `git rev-parse --short HEAD`
+commit = $(shell git rev-parse --short HEAD 2> /dev/null || echo unknown)
 ldflags = "-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(commit)"
 
 build:
diff --git a/repo/config/version.go b/repo/config/version.go
@@ -8,7 +8,7 @@ import (
 )
 
 // CurrentVersionNumber is the current application's version literal
-const CurrentVersionNumber = "0.3.8"
+const CurrentVersionNumber = "0.3.9-dev"
 
 // CurrentCommit is the current git commit, this is set as a ldflag in the Makefile
 var CurrentCommit string

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// CurrentVersionNumber is the current application's version literal`
`11`		`-const CurrentVersionNumber = "0.3.8"`
	`11`	`+const CurrentVersionNumber = "0.3.9-dev"`
`12`	`12`
`13`	`13`	`// CurrentCommit is the current git commit, this is set as a ldflag in the Makefile`
`14`	`14`	`var CurrentCommit string`