Merge pull request #47 from joonicks/dev

githash incl branch, sample conf guid note

sample.conf

@@ -71,7 +71,9 @@ link		4   ongabonga_pass
 ;
 ;  create a new bot
 ;
-;  1        the globally uniqe ID (guid), used for botnet linking
+;  1        the globally uniqe ID (guid), used for botnet linking (0-65536)
+;           Note: dont use a common number unless you are dead certain that
+;           your bot will never link to any other. Changing guid can be a mess.
 ;  emech3   the bots nick
 ;
 nick		1 emech3

src/gencmd.c

@@ -513,7 +513,7 @@ void datestamp(void)
 void githash(void)
 {
 #ifdef HAVE_GIT
-	system("git log -n 1 | grep commit | sed -r 's/^commit (.{7}).*/#define GITHASH \" (git:\\1)\"/g;' > githash.h");
+	system("./lib/git.sh > githash.h");
 #else
 	system("echo '#define GITHASH \"\"' > githash.h");
 #endif

src/lib/git.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+hash=`git log -n 1 | sed -r 's/^commit (.{7}).*$/\1/g; 1!d'`
+branch=`git status | sed -r 's/^On branch (.+)/\1/g; 1!d'`
+echo '#define GITHASH " (git:'$branch'-'$hash')"'
+