From: Jim Meyering <jim@meyering.net>
Date: Sat, 27 Aug 2005 19:05:28 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CPPI-1_12~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4bb860e0fbe87d9ffc994e15f9633416bc7e3f8;p=thirdparty%2Fcoreutils.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index a3b93f8c35..d9e0c17c2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* Version 5.3.1-cvs.
 
+	* src/du.c: Go ahead and leave the patch in (i.e., revert
+	today's change).  It doesn't cause a problem after all, since
+	--exclude-from=- is always handled before --files0-from=F.
+
 	* src/du.c: Revert the du.c part of the change from 2005-07-02:
 	That change (to reopen stdin on F for --files0-from=F) made it so
 	--exclude-from=- and --files0-from=F would not work together.