From ce2e10580d3282d47670d52a924ccb6cd1e9ba9e Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 23 Mar 2020 16:14:27 -0700
Subject: pass -p to dgit fetch

Ensures it will work if currently checked out branch does not control
d/control.
---
 bin/git-pull-safe | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'bin/git-pull-safe')

diff --git a/bin/git-pull-safe b/bin/git-pull-safe
index 9ae75906..32a61b56 100755
--- a/bin/git-pull-safe
+++ b/bin/git-pull-safe
@@ -48,6 +48,9 @@ for suite in $(git show-ref | grep refs/remotes/dgit/dgit | cut -d/ -f5 ); do
     # skip if we just called `dgit pull` on this suite
     if ! [ "$current_branch" = "dgit/$suite" ]; then
         # echo "I: fetching dgit suite $suite"
-        dgit fetch $suite
+        [ -z "$source" ] \
+            && source=$(git cat-file blob dgit/dgit/$suite:debian/control \
+                            | awk -F': ' '$1 ~ /Source/ { print $2 }')
+        dgit -p$source fetch $suite
     fi
 done
-- 
cgit v1.2.3