[openssh-commits] [openssh] branch master updated: check whether diff accepts -N

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new da2f945f6 check whether diff accepts -N
da2f945f6 is described below

commit da2f945f62e5a462381103803ee72e924bd1f137
Author: Damien Miller <djm at mindrot.org>
AuthorDate: Mon Oct 13 14:33:04 2025 +1100

    check whether diff accepts -N
---
 regress/scp3.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/regress/scp3.sh b/regress/scp3.sh
index ef316c099..d42abc2dc 100644
--- a/regress/scp3.sh
+++ b/regress/scp3.sh
@@ -8,6 +8,11 @@ DIR=${COPY}.dd
 DIR2=${COPY}.dd2
 DIFFOPT="-rN"
 
+# Figure out if diff does not understand "-N"
+if ! diff -N ${SRC}/scp.sh ${SRC}/scp.sh 2>/dev/null; then
+	DIFFOPT="-r"
+fi
+
 maybe_add_scp_path_to_sshd
 
 SRC=`dirname ${SCRIPT}`

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.