diff options
-rwxr-xr-x | dgit | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -3704,6 +3704,15 @@ sub commit_admin ($) { runcmd_ordryrun_local @git, qw(commit -m), $m; } +sub quiltify_nofix_bail ($$) { + my ($headinfo, $xinfo) = @_; + if ($quilt_mode eq 'nofix') { + fail "quilt fixup required but quilt mode is \`nofix'\n". + "HEAD commit".$headinfo." differs from tree implied by ". + " debian/patches".$xinfo; + } +} + sub commit_quilty_patch () { my $output = cmdoutput @git, qw(status --porcelain); my %adds; @@ -5197,11 +5206,7 @@ sub quiltify ($$$$) { last; } - if ($quilt_mode eq 'nofix') { - fail "quilt fixup required but quilt mode is \`nofix'\n". - "HEAD commit $c->{Commit} differs from tree implied by ". - " debian/patches (tree object $oldtiptree)"; - } + quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)"; if ($quilt_mode eq 'smash') { printdebug " search quitting smash\n"; last; |