Re: [PATCH v2] Detect if kdiff3 supports '--' and do not supply it if not supported
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:44
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH v2] Detect if kdiff3 supports '--' and do not supply it if not supported · Patrick Higgins <hidden>
Patrick Higgins [off-list ref] writes:
quoted hunk
kdiff3 can be compiled with Qt only or with KDE support. If compiled with Qt only, it does not support '--' and mergetool fails silently. Signed-off-by: Patrick Higgins <redacted> --- git-mergetool.sh | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)diff --git a/git-mergetool.sh b/git-mergetool.sh index fcdec4a..85ce004 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh@@ -181,12 +181,19 @@ merge_file () { case "$merge_tool" in kdiff3) + "$merge_tool_path" --auto -o /dev/null -- /dev/null /dev/null + if test $? -ne 0; then + double_dash="" + else + double_dash="--" + fi + if base_present ; then ("$merge_tool_path" --auto --L1 "$MERGED (Base)" --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" \ - -o "$MERGED" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1) + -o "$MERGED" $double_dash "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1) else ("$merge_tool_path" --auto --L1 "$MERGED (Local)" --L2 "$MERGED (Remote)" \ - -o "$MERGED" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1) + -o "$MERGED" $double_dash "$LOCAL" "$REMOTE" > /dev/null 2>&1) fi status=$? ;;
Now, when the name of the merged file begins with a dash (or dash-dash), what does kdiff3 without KDE do? I am wondering if it would be simpler and more robust if we did something like this, which would let us get rid of double-dash from many places... git-mergetool.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index fcdec4a..3d9833e 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh@@ -141,10 +141,10 @@ merge_file () { fi ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')" - BACKUP="$MERGED.BACKUP.$ext" - LOCAL="$MERGED.LOCAL.$ext" - REMOTE="$MERGED.REMOTE.$ext" - BASE="$MERGED.BASE.$ext" + BACKUP="./$MERGED.BACKUP.$ext" + LOCAL="./$MERGED.LOCAL.$ext" + REMOTE="./$MERGED.REMOTE.$ext" + BASE="./$MERGED.BASE.$ext" mv -- "$MERGED" "$BACKUP" cp -- "$BACKUP" "$MERGED"