X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/af27af8e1c57b9802160060156e59742dfe4e0ba..bd3f01319a03fc883d391f24639176f0f65727e5:/contrib/stg-whatchanged diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged index 231f4f5..afeda2c 100755 --- a/contrib/stg-whatchanged +++ b/contrib/stg-whatchanged @@ -25,11 +25,9 @@ fi # in this case (unlike, eg., "pick --fold") 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..