X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/af27af8e1c57b9802160060156e59742dfe4e0ba..e4f6fdcb38127754b8f0b31d202354db85553aff:/contrib/stg-whatchanged

diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged
index 231f4f5..f1f5308 100755
--- a/contrib/stg-whatchanged
+++ b/contrib/stg-whatchanged
@@ -23,13 +23,11 @@ fi
 
 # Merges via "push" leave top=bottom so we must look at old patch
 # in this case (unlike, eg., "pick --fold")
-patchdir="$(git-rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
+patchdir="$(git rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
 case $(stg log | head -n1) in
-    *push\(c\)*) current_cmd="stg show //top.old" ;;
-    *) current_cmd="stg show" ;;
+    *push\(c\)*) former="//top.old" ;;
+    *) former="//top" ;;
 esac
 
-colordiff "$@" \
-    -I '^index [0-9a-b]*..[0-9a-b]*' \
-    -I '^@@ .* @@' \
-    <($current_cmd) <(stg diff -r//bottom) | less -RFX
+stg-mdiff -o "$*" \
+    $former //bottom..