diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-08-25 11:11:08 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 5f5a11b1abc80453bd91268e859a41757f02313a (patch) | |
tree | 4e087040fae980b89382829b912e99392c7bf1be | |
parent | 150aff96f5a8740d928e2f677f987bb821b54b4b (diff) |
git-debrebase: classificaton generates Changelog type
-rwxr-xr-x | git-debrebase | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index f16b9b5..a1d277e 100755 --- a/git-debrebase +++ b/git-debrebase @@ -264,6 +264,7 @@ sub calculate_committer_authline () { # # Types: # Packaging +# Changelog # Upstream # AddPatches # Mixed @@ -337,7 +338,11 @@ sub classify ($) { } elsif ($d & DS_DEB and !($d & ~DS_DEB)) { my ($ty,$dummy) = git_cat_file "$ph[0]:debian"; if ($ty eq 'tree') { - return $classify->(qw(Packaging)); + if ($d == D_DEB_CLOG) { + return $classify->(qw(Changelog)); + } else { + return $classify->(qw(Packaging)); + } } elsif ($ty eq 'missing') { return $classify->(qw(BreakwaterStart)); } else { @@ -494,7 +499,7 @@ sub walk ($;$$) { $cur = $p0; $rewrite_from_here->(); next; - } elsif ($ty eq 'Packaging') { + } elsif ($ty eq 'Packaging' or $ty eq 'Changelog') { push @brw_cl, $cl; $cur = $p0; next; |