chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c76fbfa
)
git-debrebase: for master branch, check dgit/dgit/sid too
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 15 Feb 2018 16:09:14 +0000
(16:09 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Feb 2018 12:04:44 +0000
(12:04 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 979d8e0675336a6817aefd53b8c20c397719f1f0..47a5712e35125ef3040387236854c1fa6ea9d518 100755
(executable)
--- 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();