From af27af8e1c57b9802160060156e59742dfe4e0ba Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Tue, 24 Jul 2007 20:57:30 +0200 Subject: [PATCH] Fix stg-whatchanged to deal with conflicts already solved. The most reliable way I found to decide if we were in the process of solving a conflict, including when all conflicted files have already been marked resolved, is to check the latest patchlog entry. Signed-off-by: Yann Dirson --- contrib/stg-whatchanged | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged index a416e97..231f4f5 100755 --- a/contrib/stg-whatchanged +++ b/contrib/stg-whatchanged @@ -24,12 +24,10 @@ 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)" -if [ -s "$(git-rev-parse --git-dir)/conflicts" ]; -then - current_cmd="stg show //top.old" -else - current_cmd="stg show" -fi +case $(stg log | head -n1) in + *push\(c\)*) current_cmd="stg show //top.old" ;; + *) current_cmd="stg show" ;; +esac colordiff "$@" \ -I '^index [0-9a-b]*..[0-9a-b]*' \ -- 2.11.0