summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2018-03-21 11:20:40 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-03-21 12:06:21 +0100
commit80414b4e79d0bb774728e9e96012fe73426e848e (patch)
treeda5efc108b800500dbb3fc0d5cadd7908dc7e88d
parent1c76014d5c44d3029e4007395d011e72020295e1 (diff)
downloadptxdist-80414b4e79d0bb774728e9e96012fe73426e848e.tar.gz
ptxdist-80414b4e79d0bb774728e9e96012fe73426e848e.tar.xz
git-ptx-patches: consume complete output of man
On Debian unstable/testing man doesn't like it's stdout being closed prematurely: $ man git-format-patch | grep -q -e --notes Bad system call (core dumped) man: command exited with status 159: /usr/lib/man-db/zsoelim | /usr/lib/man-db/manconv -f UTF-8:ISO-8859-1 -t UTF-8//IGNORE | preconv -e UTF-8 | tbl | nroff -mandoc -Tutf8 This clutters the output of git ptx-patches which is annoying. While this is a bug of man(1), it is easy enough to work around by not using grep -q. Bug-Debian: https://bugs.debian.org/892309 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rwxr-xr-xscripts/git-ptx-patches2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches
index cdecd799a..66cefb62c 100755
--- a/scripts/git-ptx-patches
+++ b/scripts/git-ptx-patches
@@ -122,7 +122,7 @@ fi
# git-format-patch --notes is supported since git 1.7.6, but actually you want
# git 1.8.1-rc0 to get the notes below the --- marker
-if man git-format-patch | grep -q -e --notes; then
+if man git-format-patch | grep -e --notes > /dev/null; then
GIT_EXTRA_ARGS="$GIT_EXTRA_ARGS --notes"
fi