X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=29cf5076acd0942d746dda59249ef3c7469115c7;hp=e30a7889fa014710e8436af7e0d0bddaa9f60702;hb=74cca49dc0958db0556eabfbaf8bdc6d9d639701;hpb=e12f82b7b0d83488293f33fa3aa445744ba7d031 diff --git a/dgit b/dgit index e30a7889..29cf5076 100755 --- a/dgit +++ b/dgit @@ -1321,6 +1321,7 @@ sub clogp_authline ($) { $authline =~ m/$git_authline_re/o or fail "unexpected commit author line format \`$authline'". " (was generated from changelog Maintainer field)"; + return ($1,$2,$3) if wantarray; return $authline; } @@ -2551,8 +2552,8 @@ sub quiltify_splitbrain_needed () { } } -sub quiltify_splitbrain ($) { - my ($diffbits) = @_; +sub quiltify_splitbrain ($$) { + my ($clogp, $diffbits) = @_; if ($quilt_mode !~ m/gbp|dpm/) { # treat .gitignore just like any other upstream file $diffbits = { %$diffbits }; @@ -3057,7 +3058,7 @@ END " --quilt=gbp --quilt=dpm --quilt=unapplied ?"; if ($quilt_mode =~ m/gbp|dpm|unapplied/) { - quiltify_splitbrain($diffbits); + quiltify_splitbrain($clogp, $diffbits); return; }