build fixed when simpler shells are used to create release.h

diff --git a/mkreleasehdr.sh b/mkreleasehdr.sh
index b2369c7558e4932f133bf0df9b2ceb96cc08cecd..ea3b35a585a333b8953db29e65fa0fb1b2644b4c 100755 (executable)
--- a/mkreleasehdr.sh
+++ b/mkreleasehdr.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
-GIT_SHA1=$((git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1)
+GIT_SHA1=$(git show-ref --head --hash=8 2> /dev/null | head -n1)
 GIT_DIRTY=$(git diff 2> /dev/null | wc -l)
 test -f release.h || touch release.h
 (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
 (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate
 echo "#define REDIS_GIT_SHA1 \"$GIT_SHA1\"" > release.h
-echo "#define REDIS_GIT_DIRTY $GIT_DIRTY" >> release.h
+echo "#define REDIS_GIT_DIRTY \"$GIT_DIRTY\"" >> release.h
 touch redis.c # force recompile of redis.c

diff --git a/redis.c b/redis.c
index 8ace1898ac8051584ae28e55a5dd91695a8dd0f0..48700cdbefabf8a37e5b605ee64f7baf2185c285 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -7203,7 +7203,7 @@ static sds genRedisInfoString(void) {
         "role:%s\r\n"
         ,REDIS_VERSION,
         REDIS_GIT_SHA1,
-        REDIS_GIT_DIRTY > 0,
+        strtol(REDIS_GIT_DIRTY,NULL,10) > 0,
         (sizeof(long) == 8) ? "64" : "32",
         aeGetApiName(),
         (long) getpid(),