Produce better error reporting when absurd git wrapper fails on a patch

[dgit.git] / absurd / git

diff --git a/absurd/git b/absurd/git
index b78ec3b6a71c7503e766917854cf82412347fb26..8300b0b601d9534871b7e0211eeaa4a7783338e5 100755 (executable)
--- a/absurd/git
+++ b/absurd/git
@@ -1,8 +1,19 @@
 #!/bin/sh
 set -e
 
+case "$DGIT_ABSURD_DEBUG" in
+''|0)  exec 3>/dev/null ;;
+1)     exec 3>>../../gbp-pq-output ;;
+*)     exec 3>>../../gbp-pq-output 2>&3 ;;
+esac
+
+log () {
+       echo >&3 "DGIT ABSURD GIT APPLY (DEBUG)  $*"
+       echo >&2 "DGIT ABSURD GIT APPLY (STDERR) $*"
+}
+
 fail () {
-       echo >&2 "DGIT ABSURD GIT APPLY - FAILED: $*"
+       log "FAILED: $*"
        exit 127
 }
 
@@ -23,10 +34,16 @@ done
 
 if $bypass; then
        PATH=$npath
+       echo >&3 "DGIT ABSURD GIT APPLY - BYPASS: $*"
        exec git "$@"
 fi
 
-echo >&2 "DGIT ABSURD GIT APPLY - NO BYPASS: $*"
+log "NO BYPASS: $*"
+
+case "$DGIT_ABSURD_DEBUG" in
+''|0|1) ;;
+*)     set -x ;;
+esac
 
 #exec >/dev/tty 2>&1
 
@@ -39,6 +56,9 @@ for arg in "$@"; do
                index=1
                continue
                ;;
+       1.--whitespace=fix)
+               continue
+               ;;
        ?.-*)
                fail "UNKNOWN OPTION $arg ($*)"
                ;;
@@ -67,5 +87,5 @@ rm -rf .pc
 git checkout debian/patches/series
 git add -Af .
 
-echo >&2 "DGIT ABSURD GIT APPLY - APPLIED $patch"
+log "APPLIED $patch"
 #printf 'APPLIED '; date --iso-8601=ns