post-receive: Fix error message when pushing to an unmapped branch

[patchwork] / tools / post-receive.hook

diff --git a/tools/post-receive.hook b/tools/post-receive.hook
index 004422f1b263ead51b6719b0a7e013ca49eb35ff..4fb741d3ea98997389cbec6d70386f6d29805954 100755 (executable)
--- a/tools/post-receive.hook
+++ b/tools/post-receive.hook
@@ -3,8 +3,7 @@
 # Git post-receive hook to update Patchwork patches after Git pushes
 #
 # Copyright © 2010 martin f. krafft <madduck@madduck.net>
-# Released under the terms of the Artistic Licence 2.0
-#
+# Released under the GNU General Public License v2 or later.
 set -eu
 
 #TODO: the state map should really live in the repo's git-config
@@ -26,8 +25,8 @@ get_patchwork_hash()
 get_patch_id()
 {
   local id
-  id=$($PWDIR/bin/pwclient view -h $1 2>/dev/null \
-    | sed -rne 's,X-Patchwork-Id: ,,p')
+  id=$($PWDIR/bin/pwclient info -h $1 2>/dev/null \
+    | sed -rne 's,- id[[:space:]]*: ,,p')
   echo $id
   test -n "$id"
 }
@@ -40,7 +39,7 @@ set_patch_state()
 update_patches()
 {
   local cnt; cnt=0
-  for rev in $(git rev-list --no-merges --reverse ${1}^..${2}); do
+  for rev in $(git rev-list --no-merges --reverse ${1}..${2}); do
     if [ "$do_exit" = 1 ]; then
       echo "I: exiting..." >&2
       break
@@ -68,6 +67,6 @@ while read oldrev newrev refname; do
     fi
   done
   if [ $found -eq 0 ]; then
-    echo "E: no mapping for refname $key" >&2
+    echo "E: STATE_MAP has no mapping for branch $refname" >&2
   fi
 done