sort now reports incompatible options.

diff --git a/ChangeLog b/ChangeLog
index 418a6b6d459a77984cc86702056174bf00e8a99d..c827d8efc7b85e7daffc7a37bfb6e0839d35d87b 100644 (file)
--- 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 dbf8a7d6b8adfd9272f40b98505daa71fb0ba077..182704b57d1d5a65d2b6da060f9f53ff7525eebf 100644 (file)
--- 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