[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] init.sh: do not emit simulated diff output to stderr
From: |
Jim Meyering |
Subject: |
[PATCH] init.sh: do not emit simulated diff output to stderr |
Date: |
Thu, 22 Dec 2011 16:06:01 +0100 |
I've begun writing tests of init.sh's compare and found this right away.
I'll wait at least a few minutes before pushing this fix.
>From f70e860ca35f95bf888a2bc23e9a52ee524f8099 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 22 Dec 2011 16:04:36 +0100
Subject: [PATCH] init.sh: do not emit simulated diff output to stderr
* tests/init.sh (compare_dev_null_): Print to stdout, not stderr.
---
ChangeLog | 3 +++
tests/init.sh | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7ca5e7b..bcedee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-12-22 Jim Meyering <address@hidden>
+ init.sh: do not emit simulated diff output to stderr
+ * tests/init.sh (compare_dev_null_): Print to stdout, not stderr.
+
init.sh: correct previous change
* tests/init.sh (compare): My previous change was wrong.
Don't clobber "$?". Spotted by Stefano Lattarini and Pádraig Brady.
diff --git a/tests/init.sh b/tests/init.sh
index 1e1f0e3..43f5089 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -242,13 +242,13 @@ compare_dev_null_ ()
if test "x$1" = x/dev/null; then
test -s "$2" || return 0
- { emit_diff_u_header_ "$@"; sed 's/^/+/' -- "$2"; } >&2
+ emit_diff_u_header_ "$@"; sed 's/^/+/' -- "$2"
return 1
fi
if test "x$2" = x/dev/null; then
test -s "$1" || return 0
- { emit_diff_u_header_ "$@"; sed 's/^/-/' -- "$1"; } >&2
+ emit_diff_u_header_ "$@"; sed 's/^/-/' -- "$1"
return 1
fi
--
1.7.8.385.g1d1cb
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] init.sh: do not emit simulated diff output to stderr,
Jim Meyering <=