[StGIT PATCH 1/9] Fix contrib/stg-whatchanged way of identifying a conflict.
From: Yann Dirson <hidden>
Date: 2016-06-15 22:43:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Yann Dirson <redacted> --- contrib/stg-whatchanged | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged
index d5b6965..27513d9 100755
--- a/contrib/stg-whatchanged
+++ b/contrib/stg-whatchanged@@ -24,7 +24,7 @@ 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 [ $(cat "$patchdir/bottom") = $(cat "$patchdir/top") ]; +if [ -e "$(git-rev-parse --git-dir)/conflicts" ]; then current_cmd="stg show //top.old" else