From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 25 Aug 2017 10:11:08 +0000 (+0100)
Subject: git-debrebase: classificaton generates Changelog type
X-Git-Tag: archive/debian/5.0~322
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5f5a11b1abc80453bd91268e859a41757f02313a;p=dgit.git

git-debrebase: classificaton generates Changelog type
---

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;