diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
| commit | ae8f33be945323e02e670a97c8ac6d42a0e1be40 (patch) | |
| tree | 2bbf98c464b32b8ede618bf93929741246b81b5f /tests/lib-import-chk | |
| parent | 4a142fe137c1bed5a0cb5d14c41adcb3355458c4 (diff) | |
| parent | 7166dbc963a9c01ce62a0564bb7b905156adb560 (diff) | |
Merge tag 'debian/5.8' into stretch-bpo
dgit release 5.8 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 08 Jul 2018 11:43:29 BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'tests/lib-import-chk')
| -rw-r--r-- | tests/lib-import-chk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib-import-chk b/tests/lib-import-chk index 88984c1..d6633f9 100644 --- a/tests/lib-import-chk +++ b/tests/lib-import-chk @@ -1,11 +1,11 @@ t-import-chk-authorship () { perl -ne 'print $1,"\n" if m/^ -- (\S.*\>) /' debian/changelog \ - | sort -u \ + | t-sort -u \ > $tmp/authorship.changelog ${import_chk_changelog_massage:-:} $tmp/authorship.changelog git log --pretty=format:'%an <%ae>%n%cn <%ce>' \ - | sort -u \ + | t-sort -u \ > $tmp/authorship.commits diff $tmp/authorship.{changelog,commits} } @@ -63,7 +63,7 @@ t-import-chk2() { t-ref-same refs/heads/first-2nd-import for orig in ../${p}_${v%-*}.orig*.tar.*; do - tar -atf $orig | LC_ALL=C sort >../files.o + tar -atf $orig | t-sort >../files.o pfx=$(perl <../files.o -ne ' while (<>) { m#^([^/]+/)# or exit 0; @@ -87,7 +87,7 @@ t-import-chk2() { t-ref-same-val "$orig $start" "$imp" done git ls-tree -r --name-only "$t_ref_val:" \ - | sort >../files.g + | t-sort >../files.g diff ../files.{o,g} done cd .. |