From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 14 Dec 2005 22:46:17 +0000 (+0000)
Subject: sort now reports incompatible options.
X-Git-Tag: v6.0~1120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1dbd70442d7e177ffd6d13a46d0568778ba49ce5;p=thirdparty%2Fcoreutils.git

sort now reports incompatible options.
---

diff --git a/ChangeLog b/ChangeLog
index 418a6b6d45..c827d8efc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
 	* Version 6.0-cvs.
 
+	* NEWS: sort now reports incompatible options.
+	* src/sort.c (check_ordering_compatibility): New function.
+	(main): Use it.
+	* tests/sort/Test.pm (incompat1, incompat2, incompat3): New tests.
+
 	* src/cat.c (main): Undo previous change.  close_stdout already
 	does the check, so the previous change wasn't necessary.
 
diff --git a/NEWS b/NEWS
index dbf8a7d6b8..182704b57d 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,9 @@ GNU coreutils NEWS                                    -*- outline -*-
   if your locale settings appear to be messed up.  This change
   attempts to have the default be the best of both worlds.
 
+  sort now reports incompatible options (e.g., -i and -n) rather than
+  silently ignoring one of them.
+
 ** Scheduled for removal
 
   rm's --directory (-d) option is scheduled for removal in 2006.  This