[0/3] mergetool-lib: Don't use deprecated variable to detect GNOME

Message ID	pull.693.git.1596634463.gitgitgadget@gmail.com (mailing list archive)
Headers	show Return-Path: <SRS0=VMi1=BP=vger.kernel.org=git-owner@kernel.org> Message-Id: <pull.693.git.1596634463.gitgitgadget@gmail.com> From: "Marco Trevisan via GitGitGadget" <gitgitgadget@gmail.com> Date: Wed, 05 Aug 2020 13:34:20 +0000 Subject: [PATCH 0/3] mergetool-lib: Don't use deprecated variable to detect GNOME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fcc: Sent To: git@vger.kernel.org Cc: Marco Trevisan <mail@3v1n0.net> Sender: git-owner@vger.kernel.org Precedence: bulk
Series	mergetool-lib: Don't use deprecated variable to detect GNOME \| expand [0/3] mergetool-lib: Don't use deprecated variable to detect GNOME [1/3] mergetool-lib: use $XDG_CURRENT_DESKTOP to check GNOME [2/3] mergetool-lib: keep a list of cross desktop merge tools [3/3] mergetool-lib: give kdiff3 prioirty in KDE environments

Message ID

pull.693.git.1596634463.gitgitgadget@gmail.com (mailing list archive)

Headers

Message-Id: <pull.693.git.1596634463.gitgitgadget@gmail.com>
From: "Marco Trevisan via GitGitGadget" <gitgitgadget@gmail.com>
Date: Wed, 05 Aug 2020 13:34:20 +0000
Subject: [PATCH 0/3] mergetool-lib: Don't use deprecated variable to detect
 GNOME
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fcc: Sent
To: git@vger.kernel.org
Cc: Marco Trevisan <mail@3v1n0.net>
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

mergetool-lib: Don't use deprecated variable to detect GNOME | expand

Message

Philippe Blain via GitGitGadget Aug. 5, 2020, 1:34 p.m. UTC

To list merge tool candidates we used to use a private GNOME env variable (
GNOME_DESKTOP_SESSION_ID) that has been deprecated for long time ago and
removed as part of GNOME 3.30.0 release [1].

So replace this using XDG_CURRENT_DESKTOP instead, and cleanup the code to
avoid duplication and supporting KDE's kdiff3 better.

[1] https://gitlab.gnome.org/GNOME/gnome-session/-/commit/00e0e6226371d53f65

Marco Trevisan (Treviño) (3):
  mergetool-lib: use $XDG_CURRENT_DESKTOP to check GNOME
  mergetool-lib: keep a list of cross desktop merge tools
  mergetool-lib: give kdiff3 prioirty in KDE environments

 git-mergetool--lib.sh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)


base-commit: 85b4e0a6dc8407de6f69808d9ee6debdf167ced3
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-693%2F3v1n0%2Fdesktop-envs-fixes-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-693/3v1n0/desktop-envs-fixes-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/693