summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-15 16:09:14 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit8618ddfd0724f66e260e50f0b4dc39a8d85be220 (patch)
treee1316a61fefdf696fb8b3709b2b16d22abbded74
parentd5903f6b2f7c822465ec26f7903c3c823410c7e0 (diff)
git-debrebase: for master branch, check dgit/dgit/sid too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index 979d8e0..47a5712 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();