From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 22 Jul 2019 01:06:15 +0000 (+0100)
Subject: git-debpush: Do not spuriously print -sn/-sk
X-Git-Tag: archive/debian/9.5~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c692a79177069b52731bba1d3c495e521b6e4449;p=dgit.git

git-debpush: Do not spuriously print -sn/-sk

When looking for -sn or -sk in debian/source/options, we need to not
print it to stdout even if grep finds it.  So use -q.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Acked-by: Sean Whitton <spwhitton@spwhitton.name>
---

diff --git a/git-debpush b/git-debpush
index 744212af..beb24fbf 100755
--- a/git-debpush
+++ b/git-debpush
@@ -246,9 +246,9 @@ case "$format" in
     '3.0 (quilt)')  upstream=true ;;
     '3.0 (native)') upstream=false ;;
     '1.0'|'')
-	if get_file_from_ref debian/source/options | grep '^-sn *$'; then
+	if get_file_from_ref debian/source/options | grep -q '^-sn *$'; then
 	    upstream=false
-        elif get_file_from_ref debian/source/options | grep '^-sk *$'; then
+        elif get_file_from_ref debian/source/options | grep -q '^-sk *$'; then
 	    upstream=true
 	else
 	    fail 'please see "SOURCE FORMAT 1.0" in git-debpush(1)'