From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Aug 2018 11:48:03 +0000 (+0100)
Subject: dgit: branch_is_gdr: Put gdr commit annotations in alphabetical order
X-Git-Tag: archive/debian/6.10~49
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=788c71b25686960edf9cf80b2f4d3223951959ec;p=dgit.git

dgit: branch_is_gdr: Put gdr commit annotations in alphabetical order

This makes it slightly easier to see our test coverage.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 2774f7e5..1f42dd33 100755
--- a/dgit
+++ b/dgit
@@ -335,8 +335,8 @@ sub branch_is_gdr ($) {
 	my $cdata = git_cat_file $walk, 'commit';
 	my ($hdrs,$msg) = $cdata =~ m{\n\n} ? ($`,$') : ($cdata,'');
 	if ($msg =~ m{^\[git-debrebase\ (
-			  anchor | pseudomerge | changelog | 
-			  make-patches | merged-breakwater
+			  anchor | changelog | make-patches | 
+			  merged-breakwater | pseudomerge
 		      ) [: ] }mx) {
 	    # no need to analyse this - it's sufficient
 	    # (gdr classifications: Anchor, MergedBreakwaters)