chiark / gitweb /
git-debpush: Do not spuriously print -sn/-sk
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 22 Jul 2019 01:06:15 +0000 (02:06 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 22 Jul 2019 12:45:47 +0000 (13:45 +0100)
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>
git-debpush

index 744212af17cd0dae568caab5d9ff44784f48a32c..beb24fbf2ba7b421ede799540d445bd40adb6ce9 100755 (executable)
@@ -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)'