From: Yann Dirson Date: Tue, 24 Jul 2007 18:57:46 GMT Subject: [StGIT PATCH 4/4] Port stg-whatchanged improvements to stg-mdiff and have the former use the latter. Message-ID: <20070724185746.17180.29218.stgit@gandelf.nowhere.earth> In-Reply-To: <20070724185535.17180.24577.stgit@gandelf.nowhere.earth> From: Yann Dirson Signed-off-by: Yann Dirson --- contrib/stg-mdiff | 2 ++ contrib/stg-whatchanged | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/stg-mdiff b/contrib/stg-mdiff index 61cba9e..74d7f77 100755 --- a/contrib/stg-mdiff +++ b/contrib/stg-mdiff @@ -46,4 +46,6 @@ case "$2" in esac colordiff $diffopts \ + -I '^index [0-9a-b]*..[0-9a-b]*' \ + -I '^@@ .* @@' \ <($cmd1 "$1") <($cmd2 "$2") | less -RFX 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..