summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2010-10-14 00:11:11 +0200
committerAndreas Gruenbacher <agruen@suse.de>2010-10-14 00:11:11 +0200
commit5b460672d70ba180fb59d012b06ae1fe45a867b3 (patch)
tree80369dedd812e6e542d4576a7977335e0f30e31e /src
parent3e234c40d29d3ccf01d288c7e56488b259199153 (diff)
downloadpatch-5b460672d70ba180fb59d012b06ae1fe45a867b3.tar.gz
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.
Diffstat (limited to 'src')
-rw-r--r--src/pch.c7
1 files changed, 4 insertions, 3 deletions
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)
{