zephyr-post-receive: Respect zephyr.instance on new branch creation.

[Scripts/git/.git] / git-hooks / zephyr-post-receive

diff --git a/git-hooks/zephyr-post-receive b/git-hooks/zephyr-post-receive
index f148d17e8ffa112764f42808660a725944f1992b..a929432b3aef5c03b56a211b791aad24de3a37c1 100755 (executable)
--- a/git-hooks/zephyr-post-receive
+++ b/git-hooks/zephyr-post-receive
@@ -10,6 +10,26 @@
 class=`git config zephyr.class`
 instance=`git config zephyr.instance`
 zsig=`git config zephyr.zsig`
+color=`git config --bool zephyr.color`
+
+if [ "${color:-true}" = "true" ]; then
+    usecolor="--color"
+else
+    usecolor=""
+fi
+
+if [ -z "$zsig" ]; then
+    if [ -e "$GIT_DIR/description" ]; then
+        zsig=`cat "$GIT_DIR/description"`
+    fi
+    if [ -z "$zsig" ] || [ "$zsig" = "Unnamed repository; edit this file to name it for gitweb." ]; then
+        zsig=$(basename "$(readlink -f "$GIT_DIR")")
+        if [ "$zsig" = ".git" ]; then
+            zsig=$(basename "$(readlink -f "$GIT_DIR/..")")
+        fi
+    fi
+fi
+
 if [ -z "$class" ]; then
   echo "I don't know where to send a commit zephyr!" >&2
   echo "Please set the zephyr.class config variable in" >&2
@@ -17,14 +37,23 @@ if [ -z "$class" ]; then
   exit 1
 fi
 while read oldrev newrev refname; do
-  git-rev-list --reverse "$oldrev..$newrev" | while read rev; do
+  if [ "$oldrev" = "0000000000000000000000000000000000000000" ]; then
+    # dammit git
+    zwrite -c "$class" -i "${instance:-$(basename "$refname")}" -s "$zsig: $refname" -d \
+      -m "New branch $refname created, currently at $newrev."
+    continue
+  fi
+  git rev-list --first-parent --reverse "$oldrev..$newrev" | while read rev; do
     shortrev=`git log -1 --pretty=format:%h "$rev"`
-    (git show --stat --color "$rev" |
-     sed "s/@/@@/g" |
-     sed "s/\e\[m/@color(default)/g" |
-     sed "s/\e\[33m/@color(yellow)/g" |
-     sed "s/\e\[31m/@color(red)/g" |
-     sed "s/\e\[32m/@color(green)/g") |
-    zwrite -c "$class" -i "${instance:-$shortrev}" -s "${zsig:-Git}: $refname" -d
+    (git show --stat -M $usecolor "$rev" |
+     sed -e 's/@/@@/g' \
+         -e 's/}/@(})/g' \
+         -e 's/\e\[m/}@{/g' \
+         -e 's/\e\[33m/@color(yellow)/g' \
+         -e 's/\e\[31m/@color(red)/g' \
+         -e 's/\e\[32m/@color(green)/g' \
+         -e '1s/^/@{/' \
+         -e '$s/$/}/') |
+    zwrite -c "$class" -i "${instance:-$shortrev}" -s "$zsig: $refname" -d
   done
 done