now redis-cli is able to show the Git SHA1 in the version output

diff --git a/src/Makefile b/src/Makefile
index 51ac2d47af89955ce8edbda794e42a0ef785067e..ac0db5770af95ffa68d41973b1897c239c0f5c4f 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,7 +26,7 @@ INSTALL= cp -p
 
 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o
 BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
-CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o
+CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o
 CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o
 CHECKAOFOBJ = redis-check-aof.o
 

diff --git a/src/redis-cli.c b/src/redis-cli.c
index 450c6d58794fe26a38e36b02a1834d474b18d106..eef5ad1e07f7776618842d98af0a6a96944cb819 100644 (file)
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -67,6 +67,7 @@ static struct config {
 } config;
 
 static void usage();
+char *redisGitSHA1(void);
 
 /*------------------------------------------------------------------------------
  * Utility functions
@@ -351,7 +352,7 @@ static int parseOptions(int argc, char **argv) {
 "automatically used as last argument.\n"
             );
         } else if (!strcmp(argv[i],"-v")) {
-            printf("redis-cli shipped with Redis version %s\n", REDIS_VERSION);
+            printf("redis-cli shipped with Redis version %s (%s)\n", REDIS_VERSION, redisGitSHA1());
             exit(0);
         } else {
             break;