Fix the --binary option when used together with --silent

* src/pch.c (there_is_another_patch): Set p_strip_trailing_cr
to false if no_strip_trailing_cr is set independent of the verbosity.
This broke the --binary option in combination with --silent.

2 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c5f53f..04caeaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-14  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/pch.c (there_is_another_patch): Set p_strip_trailing_cr
+	to false if no_strip_trailing_cr is set independent of the verbosity.
+	This broke the --binary option in combination with --silent.
+
+2010-10-05  Andreas Gruenbacher  <agruen@suse.de>
+
 	* src/util.c: Add a maybe_quoted parameter to fetchname.
 	* src/pch.c: Only recognize quited filename in the "diff --git"
 	format, at least for now.
diff --git a/src/pch.c b/src/pch.c
index 8e039ff..1653ee4 100644
--- a/src/pch.c
+++ b/src/pch.c
@@ -257,14 +257,15 @@ there_is_another_patch (bool need_header, mode_t *file_type)
 	    diff_type == GIT_BINARY_DIFF ? "a git binary diff" :
 	    "an ed script" );
 
+    if (no_strip_trailing_cr)
+      p_strip_trailing_cr = false;
+
     if (verbosity != SILENT)
       {
 	if (p_indent)
 	  say ("(Patch is indented %lu space%s.)\n",
 	       (unsigned long int) p_indent, p_indent==1?"":"s");
-	if (no_strip_trailing_cr)
-	  p_strip_trailing_cr = false;
-	else if (p_strip_trailing_cr)
+	if (p_strip_trailing_cr)
 	  say ("(Stripping trailing CRs from patch.)\n");
 	if (! inname)
 	  {