summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2012-07-23 09:29:57 +0100
committerPádraig Brady <P@draigBrady.com>2012-07-23 09:54:18 +0100
commitd75e93cb76c504e766e317ea0891285e4510ae67 (patch)
treea313cdcfb5adb6cc94968e9f93a709b906860d4e
parentf93d5985a2bc468f9f92f3bb8dedb0d3bf0807d8 (diff)
downloadcoreutils-d75e93cb76c504e766e317ea0891285e4510ae67.tar.xz
tests: add a test for a previously fixed output format bug in join
Add a test and NEWS entry for a bug inadvertently fixed in a refactoring in commit v8.9-32-gd4db0cb * tests/misc/join (v2-format): Add a new test. * THANKS.in: Add the reporter. * NEWS: Mention the old bug. * cfg.mk (old_NEWS_hash): Update. Reported-by: Jean-Pierre Tosoni
-rw-r--r--NEWS4
-rw-r--r--THANKS.in1
-rw-r--r--cfg.mk2
-rwxr-xr-xtests/misc/join4
4 files changed, 10 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 113b30a02..f1255eabb 100644
--- a/NEWS
+++ b/NEWS
@@ -477,6 +477,10 @@ GNU coreutils NEWS -*- outline -*-
join --header now skips the ordering check for the first line
even if the other file is empty. [bug introduced in coreutils-8.5]
+ join -v2 now ensures the default output format prints the match field
+ at the start of the line when it is different to the match field for
+ the first file. [bug present in "the beginning".]
+
rm -f no longer fails for EINVAL or EILSEQ on file systems that
reject file names invalid for that file system.
diff --git a/THANKS.in b/THANKS.in
index dc0b9dd95..5db443bce 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -275,6 +275,7 @@ Jari Aalto jari.aalto@cante.net
Jarkko Hietaniemi jhi@epsilon.hut.fi
Jarod Wilson jwilson@redhat.com
Jean Charles Delepine delepine@u-picardie.fr
+Jean-Pierre Tosoni jpt.7196@gmail.com
Jeff Moore jbm@mordor.com
Jeff Sheinberg jeff@bsrd.net
Jens Elkner elkner@imsgroup.de
diff --git a/cfg.mk b/cfg.mk
index f7805111b..261efa527 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -45,7 +45,7 @@ export VERBOSE = yes
# 4914152 9e
export XZ_OPT = -8e
-old_NEWS_hash = 4f70c9ef883feff18d9d5f66a941f3a8
+old_NEWS_hash = 38cad4d11c6ce866fc52213e3a4dc437
# Add an exemption for sc_makefile_at_at_check.
_makefile_at_at_check_exceptions = ' && !/^cu_install_program =/'
diff --git a/tests/misc/join b/tests/misc/join
index a3fd1a8fa..62074b7be 100755
--- a/tests/misc/join
+++ b/tests/misc/join
@@ -147,6 +147,10 @@ my @tv = (
["a,1,,2\nb,1,2\n", "a,3,4\nb,3,4\n"],
"a,1,,2,3,4\nb,1,2,,3,4\n"],
+# For -v2, print the match field correctly with the default output format,
+# when that match field is different between file 1 and file 2. Fixed in 8.10
+['v2-order', '-v2 -2 2', ["", "2 1\n"], "1 2\n", 0],
+
# From Tim Smithers: fixed in 1.22l
['trailing-sp', '-t: -1 1 -2 1', ["a:x \n", "a:y \n"], "a:x :y \n", 0],