diff --git a/contrib/devtools/lint-whitespace.sh b/contrib/devtools/lint-whitespace.sh
index af9a57910..877fa00d4 100755
--- a/contrib/devtools/lint-whitespace.sh
+++ b/contrib/devtools/lint-whitespace.sh
@@ -37,21 +37,26 @@ if showdiff | grep -E -q '^\+.*\s+$'; then
   echo "The following changes were suspected:"
   FILENAME=""
   SEEN=0
+  SEENLN=0
   while read -r line; do
     if [[ "$line" =~ ^diff ]]; then
       FILENAME="$line"
       SEEN=0
     elif [[ "$line" =~ ^@@ ]]; then
       LINENUMBER="$line"
+      SEENLN=0
     else
       if [ "$SEEN" -eq 0 ]; then
         # The first time a file is seen with trailing whitespace, we print the
         # filename (preceded by a newline).
         echo
         echo "$FILENAME"
-        echo "$LINENUMBER"
         SEEN=1
       fi
+      if [ "$SEENLN" -eq 0 ]; then
+        echo "$LINENUMBER"
+        SEENLN=1
+      fi
       echo "$line"
     fi
   done < <(showdiff | grep -E '^(diff --git |@@|\+.*\s+$)')
@@ -64,21 +69,26 @@ if showcodediff | grep -P -q '^\+.*\t'; then
   echo "The following changes were suspected:"
   FILENAME=""
   SEEN=0
+  SEENLN=0
   while read -r line; do
     if [[ "$line" =~ ^diff ]]; then
       FILENAME="$line"
       SEEN=0
     elif [[ "$line" =~ ^@@ ]]; then
       LINENUMBER="$line"
+      SEENLN=0
     else
       if [ "$SEEN" -eq 0 ]; then
         # The first time a file is seen with a tab character, we print the
         # filename (preceded by a newline).
         echo
         echo "$FILENAME"
-        echo "$LINENUMBER"
         SEEN=1
       fi
+      if [ "$SEENLN" -eq 0 ]; then
+        echo "$LINENUMBER"
+        SEENLN=1
+      fi
       echo "$line"
     fi
   done < <(showcodediff | grep -P '^(diff --git |@@|\+.*\t)')