From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jul 2019 22:51:13 +0000 (+0100)
Subject: git-debpush: Defend against unexpected git-deborig output
X-Git-Tag: archive/debian/9.1~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=66f76f761bc38ab61dd068af4b9200b05002305b;hp=d5bbd5fe5b15f40c1153ab2bc3f469e3a49b1daa;p=dgit.git

git-debpush: Defend against unexpected git-deborig output

If git-deborig prints something other than a tag name, for example an
error message (see #931509), this approach will bomb out, roughly
appropriately.

This will also become useful when we make upstream_tag overrideable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Acked-by: Sean Whitton <spwhitton@spwhitton.name>
---

diff --git a/git-debpush b/git-debpush
index 316d6c1a..e9b64d4a 100755
--- a/git-debpush
+++ b/git-debpush
@@ -217,7 +217,7 @@ if $upstream; then
     # xxx want way to override this
     upstream_tag=$(git deborig --just-print --version="$version" \
                        | head -n1)
-    upstream_committish=$(git rev-parse ${upstream_tag}^{})
+    upstream_committish=$(git rev-parse "refs/tags/${upstream_tag}"^{})
     upstream_info=" upstream-tag=$upstream_tag upstream=$upstream_committish"
 fi