From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 15 Feb 2018 16:09:14 +0000 (+0000)
Subject: git-debrebase: for master branch, check dgit/dgit/sid too
X-Git-Tag: archive/debian/5.0~234
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8618ddfd0724f66e260e50f0b4dc39a8d85be220;p=dgit.git

git-debrebase: for master branch, check dgit/dgit/sid too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 979d8e06..47a5712e 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -917,6 +917,8 @@ sub record_ffq_prev () {
     }
     if ($branch =~ m{^dgit/}) {
 	$check->("remotes/dgit/$branch", 'remote dgit branch');
+    } elsif ($branch =~ m{^master$}) {
+	$check->("remotes/dgit/dgit/sid", 'remote dgit branch for sid');
     }
 
     fproblems_maybe_bail();