From: Alejandro Colomar <alx@kernel.org>
Date: Thu, 9 Jan 2025 12:24:13 +0000 (+0100)
Subject: src/bin/duffman: Diff against HEAD, not the system pages
X-Git-Tag: man-pages-6.10~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c506624b0056ae4a4596817be527ba24bf62fca0;p=thirdparty%2Fman-pages.git

src/bin/duffman: Diff against HEAD, not the system pages

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/src/bin/duffman b/src/bin/duffman
index 4c05b73f2..48cd6d234 100755
--- a/src/bin/duffman
+++ b/src/bin/duffman
@@ -4,17 +4,48 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 set -Eeuo pipefail;
+shopt -s lastpipe;
 
-# diff all modified pages against the system ones.
+# Defaults:
+s='';
+u='-u';
+w='';
+
+while getopts "sU:w" opt; do
+	case "$opt" in
+	s)	s='-s';		;;
+	U)	u="-U$OPTARG";	;;
+	w)	w='-w';		;;
+	\?)	exit 1;		;;
+	*)	exit 1;		;;
+	esac;
+done;
+shift $((OPTIND-1));
+
+if test $# -gt 0; then
+	>&2 echo "$(basename "$0"): error: Too many arguments.";
+	exit 1;
+fi;
 
 cd $(git rev-parse --show-toplevel);
 
+test -v MAN_KEEP_FORMATTING || export MAN_KEEP_FORMATTING=1;
+
+# shellcheck disable=SC2206  # We want only non-empty variables in the array.
+opts=($s $w $u);
+
 git diff --name-only \
 | grep -E '(\.[[:digit:]]([[:alpha:]][[:alnum:]]*)?\>|\.man)+(\.man|\.in)*$' \
 | sortman \
 | while read f; do \
-	sys="$(basename "$f")";
+	old="HEAD:$f";
+	new="./$f";
 
-	diffman "$@" "$sys" "$f" || true;
+	cat "$new" \
+	| man /dev/stdin \
+	| diff --label "$old" --label "$new" "${opts[@]}" \
+		<(git show "$old" | man /dev/stdin) \
+		/dev/stdin \
+	|| true;
 done \
 | less -R;