chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: start 9.0
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 84fcc3f20f34b988d3d49e4ab5c2bcf48dffc7ed..2d235a633fa9433d5febcf8b78ba2c9d7a62a4ec 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-82,7
+82,7
@@
our $quilt_mode;
our $quilt_upstream_commitish;
our $quilt_upstream_commitish_used;
our $quilt_upstream_commitish_message;
our $quilt_upstream_commitish;
our $quilt_upstream_commitish_used;
our $quilt_upstream_commitish_message;
-our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball)?';
+our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball
|\+git
)?';
our $quilt_modes_re = "linear|smash|auto|nofix|nocheck|unapplied|$quilt_options_re";
our $splitview_mode;
our $splitview_modes_re = qr{auto|always|never};
our $quilt_modes_re = "linear|smash|auto|nofix|nocheck|unapplied|$quilt_options_re";
our $splitview_mode;
our $splitview_modes_re = qr{auto|always|never};
@@
-7716,6
+7716,7
@@
sub parseopts_late_defaults () {
or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
$quilt_mode = $1;
}
or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
$quilt_mode = $1;
}
+ $quilt_mode =~ s/^(baredebian)\+git$/$1/;
foreach my $moc (@modeopt_cfgs) {
local $access_forpush;
foreach my $moc (@modeopt_cfgs) {
local $access_forpush;