path: root/absurd
diff options
authorIan Jackson <>2016-12-19 14:45:18 +0000
committerIan Jackson <>2016-12-19 16:58:57 +0000
commit83f9c7600efd098a5c4a5d4b1938f4df8acfd54a (patch)
tree38dcde39c206222f1f5bc1906a97699776cb584b /absurd
parent815eb9d89a743bcd20e566eaabbfd2233109b24b (diff)
Produce better error reporting when absurd git wrapper fails on a patch
during .dsc import. Apropos of #848391. gbp swallows the error from the first run (without --whitespace=fix). Previously only that first run would do anything useful; the second would complain about --whitespace=fix. So failures of dpkg-source would always produce a useless error message. Instead, tolerate (and ignore) the --whitespace=fix option which gbp passes during the second run. This means that the second run tries to do the actual work. This only does extra work if the first run failed, and since the first and second runs are now equivalent, that happens when the second run fails too. But in return for that extra work, we get a report which actually mentions something that unexpectedly went wrong. (The alternative would be to have absurd/git try to stash and then reproduce its previous error, or to make more fragile assumptions about gbp's behaviour.) Signed-off-by: Ian Jackson <>
Diffstat (limited to 'absurd')
1 files changed, 3 insertions, 0 deletions
diff --git a/absurd/git b/absurd/git
index 8605008..8300b0b 100755
--- a/absurd/git
+++ b/absurd/git
@@ -56,6 +56,9 @@ for arg in "$@"; do
+ 1.--whitespace=fix)
+ continue
+ ;;
fail "UNKNOWN OPTION $arg ($*)"