From 9385ad0c87e57271a5c6c2436282d4d3f51e02c4 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Wed, 5 Dec 2012 00:41:40 -0300 Subject: [PATCH] schhist/schhist2web: explicitly suppress diff in "git show" Seems that recent versions of git always display it while older versions only did, if using --pretty, when explicitly asked to do so. --- schhist/schhist2web | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/schhist/schhist2web b/schhist/schhist2web index 5db1b6f..10cf6c5 100755 --- a/schhist/schhist2web +++ b/schhist/schhist2web @@ -67,7 +67,8 @@ EOF echo "
"
     ( cd "$dir" && git show \
         --pretty=format:"%aN <%aE>%n    %ad%n%n    %s" \
-	--quiet $next; ) | sed '/\(.\{'$CUTOFF'\}\).*/s//\1.../' |
+	--quiet $next; ) | sed '/^diff /Q' |
+	sed '/\(.\{'$CUTOFF'\}\).*/s//\1.../' |
       sed 's/&/&/g;s//\>/g' |
       if [ -z "$SCHHIST_COMMIT_TEMPLATE" ]; then
 	cat