diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-04-23 01:15:50 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 22:40:14 +0100 |
commit | d51c2ac366c86d1dd3cc9ac04d5b3b14b1ff23c5 (patch) | |
tree | f34901c3b8e39df150c6b33135dee07b0e00adb7 /dgit | |
parent | a02cbb3c36fa4dc9b073d9494f7b4cedb54f1f08 (diff) |
dgit: Break out quiltify_nofix_bail (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-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; |