From 7b890885b38e1258bf0d64be7fc0ea396cc0c047 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 25 Aug 2017 11:11:08 +0100 Subject: [PATCH] classificaton generates Changelog type --- git-debrebase | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/git-debrebase b/git-debrebase index f16b9b59..a1d277e5 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; -- 2.30.2