Split brain: Generate .gitignore patch in deterministic order

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 40c7f3ec2f007aff628452690e049e7a6f15b193..4af8f34cd2b21ab71b08529c9e0aaf2b6efe8db6 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2598,7 +2598,7 @@ updates to users of the official Debian archive view of the package.
 END
         close GIPATCH or die "$gipatch: $!";
         runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
 END
         close GIPATCH or die "$gipatch: $!";
         runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),

-            $unapplied, $headref, "--", keys %$editedignores;
+            $unapplied, $headref, "--", sort keys %$editedignores;

         open SERIES, "+>>", "debian/patches/series" or die $!;
         defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
         my $newline;
         open SERIES, "+>>", "debian/patches/series" or die $!;
         defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
         my $newline;