From 8618ddfd0724f66e260e50f0b4dc39a8d85be220 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 15 Feb 2018 16:09:14 +0000 Subject: [PATCH] git-debrebase: for master branch, check dgit/dgit/sid too Signed-off-by: Ian Jackson --- git-debrebase | 2 ++ 1 file changed, 2 insertions(+) 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(); -- 2.30.2