From 06bf2c90a574cb55e92494a925a2da1cfdd35738 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Fri, 10 Jan 2025 01:53:14 +0100 Subject: [PATCH] src/bin/duffman: Allow diffing two git references Signed-off-by: Alejandro Colomar --- src/bin/duffman | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bin/duffman b/src/bin/duffman index a27cb2f06..273758d14 100755 --- a/src/bin/duffman +++ b/src/bin/duffman @@ -22,7 +22,7 @@ while getopts "sU:w" opt; do done; shift $((OPTIND-1)); -if test $# -gt 1; then +if test $# -gt 2; then >&2 echo "$(basename "$0"): error: Too many arguments."; exit 1; fi; @@ -35,15 +35,17 @@ test -v MAN_KEEP_FORMATTING || export MAN_KEEP_FORMATTING=1; opts=($s $w $u); case $# in -0) git diff --name-only; -*) git diff --name-only "$1^..$1"; +0) git diff --name-only; ;; +1) git diff --name-only "$1^..$1"; ;; +*) git diff --name-only "$1..$2"; ;; esac \ | grep -E '(\.[[:digit:]]([[:alpha:]][[:alnum:]]*)?\>|\.man)+(\.man|\.in)*$' \ | sortman \ | while read f; do \ case $# in 0) old="HEAD:$f"; new="./$f"; ;; - *) old="$1^:$f"; new="$1:$f"; ;; + 1) old="$1^:$f"; new="$1:$f"; ;; + *) old="$1:$f"; new="$2:$f"; ;; esac; case $# in -- 2.47.2