grep branch, master, updated. v2.21-50-g3f50c6f

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  3f50c6f0b09dd5be1b3d8413eb0be606fe48599d (commit)
      from  d4582ed5a6141d5935d962335ead2705624f7e13 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3f50c6f0b09dd5be1b3d8413eb0be606fe48599d


commit 3f50c6f0b09dd5be1b3d8413eb0be606fe48599d
Author: Jim Meyering <address@hidden>
Date:   Fri Jul 17 14:35:23 2015 -0700

    tests: fix mis-applied patch.
    
    * tests/include-exclude: I applied "|sort" to the wrong creation
    of "out", and didn't push the same patch that I'd tested.

diff --git a/tests/include-exclude b/tests/include-exclude
index cdbb9d6..6a9d269 100755
--- a/tests/include-exclude
+++ b/tests/include-exclude
@@ -59,7 +59,7 @@ compare exp-a out || fail=1
 (cd x && grep -r --exclude-dir=. '^aaa$') > out || fail=1
 compare exp-aa out || fail=1
 
-grep --exclude=- '^aaa$' - < x/a | sort > out || fail=1
+grep --exclude=- '^aaa$' - < x/a > out || fail=1
 compare exp-aaa out || fail=1
 
 for exclude in 'x' 'x*'; do
@@ -67,7 +67,7 @@ for exclude in 'x' 'x*'; do
     test $? -eq 1 || fail=1
     compare /dev/null out || fail=1
 
-    grep -rl --exclude-dir="$exclude" . ./x > out || fail=1
+    grep -rl --exclude-dir="$exclude" . ./x | sort > out || fail=1
     compare exp-dotnames out || fail=1
 done
 

-----------------------------------------------------------------------

Summary of changes:
 tests/include-exclude |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep