diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-24 21:41:55 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-24 21:41:55 +0100 |
commit | b9ef2453ea950bd60ddb52e2253cdf762f34534d (patch) | |
tree | c5200e042c681a1024f11f752c30042d326d72a5 /dgit | |
parent | ff26ffe86083d2759ae4f6d839d69ff4da5182d7 (diff) |
git-debrebase: Do not try split brain gdr make-patches
Print a helpful error message instead.
Closes: #906908.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -4235,6 +4235,15 @@ END my $actualhead = git_rev_parse('HEAD'); if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) { + if (quiltmode_splitbrain()) { + my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $actualhead); + fail <<END; +Branch is managed by git-debrebase ($ffq_prev +exists), but quilt mode ($quilt_mode) implies a split view. +Pass the right --quilt option or adjust your git config. +Or, maybe, run git-debrebase forget-was-ever-debrebase. +END + } runcmd_ordryrun_local @git_debrebase, 'stitch'; $actualhead = git_rev_parse('HEAD'); } |