diff options
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | dgit | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index a288558..3418c7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ dgit (2.9~) unstable; urgency=low about possible skew). * dgit gbp-build will arrange to let gbp buildpackage generate .orig tarballs if it seems applicable. Closes:#841094. + * Reject `dgit pull' in split view quilt modes, to avoid + creating unfortunate wreckage on non-dgit-view branches. + Closes:#842608. -- @@ -3682,6 +3682,12 @@ sub cmd_fetch { sub cmd_pull { parseopts(); fetchpullargs(); + if (quiltmode_splitbrain()) { + my ($format, $fopts) = get_source_format(); + madformat($format) and fail <<END +dgit pull not yet supported in split view mode (--quilt=$quilt_mode) +END + } pull(); } |