From: Ian Jackson Date: Sat, 4 Jun 2016 16:03:41 +0000 (+0100) Subject: Split brain: Generate .gitignore patch in deterministic order X-Git-Tag: archive/debian/2.0~302 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=da5d472747438a473f9981911996963c084aca54;p=dgit.git Split brain: Generate .gitignore patch in deterministic order --- diff --git a/dgit b/dgit index 40c7f3ec..4af8f34c 100755 --- 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), - $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;