From e5284b15378085f541449532798d3d99b13cacd2 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Fri, 3 Jan 2020 15:32:07 -0800 Subject: [PATCH] sort: Don't do fallback top-level sort in check mode The fallback useful to provide a consistent order of tied lines, but in check mode, we don't want it to report disorder for equal lines (according to the passed flags). Thanks to Richard Ipsum for the bug report and proposed patch. --- sort.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sort.c b/sort.c index a51997f..fbb1abf 100644 --- a/sort.c +++ b/sort.c @@ -385,7 +385,8 @@ main(int argc, char *argv[]) /* -b shall only apply to custom key definitions */ if (TAILQ_EMPTY(&kdhead) && global_flags) addkeydef("1", global_flags & ~(MOD_STARTB | MOD_ENDB)); - addkeydef("1", global_flags & MOD_R); + if (TAILQ_EMPTY(&kdhead) || (!Cflag && !cflag)) + addkeydef("1", global_flags & MOD_R); if (!argc) { if (Cflag || cflag) {