From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 4DE271F453 for ; Thu, 25 Apr 2019 09:54:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728713AbfDYJyw (ORCPT ); Thu, 25 Apr 2019 05:54:52 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:38937 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727536AbfDYJyu (ORCPT ); Thu, 25 Apr 2019 05:54:50 -0400 Received: by mail-pl1-f193.google.com with SMTP id e92so9046273plb.6 for ; Thu, 25 Apr 2019 02:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=YZgysgXEhpqkUO8cf301jh4x0JoX/GnOM6QKUIXwyDo=; b=G2J45R+L6Rd1oqageZX1iuj9/aGwFonbDwOYoTEX3aMvFe8Tk/0JuYWZx7JBqZ3Fge vAzaYE3gly+asbo89+eGmltAkjj/VXoSDRfuKvtsHvn5nGuM+JxZh31NYCcf73XlAVh/ ioXhRQ3T4rBS36dCEDICAvGwq2sUzmHKsq4JA6p/KvYxfnghcqINsVv5LPIwEyycb37/ MOShzMlBafQ5NJXLjjYk99trg90t4QpYjqkREYF+G7BnV+dZsEKWQjbYh+AT4KCuq/QT 8BKftQBXy8DNmNbY/XTRqofaAnIo2PQR70is0Frj8MJev5KR7njslyxNbk+nA8LVF5kW xrOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=YZgysgXEhpqkUO8cf301jh4x0JoX/GnOM6QKUIXwyDo=; b=LBAcsnOwRhUWvBlmWZ6xVWZGHggLZcMTtk3vxbSMEXcuhgcCKc9HbxsAAIs6DVAOuX X7BiVM4Jc3UFcoZAFuNsTf2NN0h4Dq3+ExaROB5elyKdM90pujwbod64HUCAsOMf3z4I fvJ5mHVnM9fJBfL4sLc9MzZX+C/P43OL1d8argIuDe9Hoz8kGJEFWfXIdBXiL0k5JSp2 3ddV0gJkHWPDkKYuWVZAjhmliirn7yP0AnLpixOJXrK4g4BMuwI0GZxZx32CXs2Pix0g 0DGNvNGMizC/+mPKG5l2K8eF1FeKJW8Jiy0M33hEH7E5hj0RDPxFpBFk1CXzQrwWqsen TweQ== X-Gm-Message-State: APjAAAXKRKZGPaZZ+q4KWschgAQFkkjUazNfoD67d1hcQYcDSYx5WgKe OMoQWUPu/1kv1AluCooTMZ4aTFXK X-Google-Smtp-Source: APXvYqyR6LeKpuotgvn708qTORy9csM4J5i4cQW/rvM3GwN+0fTZEcNnbET9fpyYacTXTqPekkHsDw== X-Received: by 2002:a17:902:be18:: with SMTP id r24mr36883216pls.69.1556186089873; Thu, 25 Apr 2019 02:54:49 -0700 (PDT) Received: from archbookpro.localdomain (c-73-222-73-77.hsd1.ca.comcast.net. [73.222.73.77]) by smtp.gmail.com with ESMTPSA id k186sm38932865pfc.137.2019.04.25.02.54.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 02:54:49 -0700 (PDT) Date: Thu, 25 Apr 2019 02:54:47 -0700 From: Denton Liu To: Git Mailing List Cc: Johannes Schindelin , David Aguilar , Jeff Hostetler , Eric Sunshine , Junio C Hamano Subject: [PATCH v4 6/6] difftool: fallback on merge.guitool Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In git-difftool.txt, it says 'git difftool' falls back to 'git mergetool' config variables when the difftool equivalents have not been defined. However, when `diff.guitool` is missing, it doesn't fallback to anything. Make git-difftool fallback to `merge.guitool` when `diff.guitool` is missing. Signed-off-by: Denton Liu --- Documentation/git-difftool.txt | 4 +++- builtin/difftool.c | 10 ++-------- t/t7800-difftool.sh | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 96c26e6aa8..484c485fd0 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -90,7 +90,9 @@ instead. `--no-symlinks` is the default on Windows. When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. The `--no-gui` - option can be used to override this setting. + option can be used to override this setting. If `diff.guitool` + is not set, we will fallback in the order of `merge.guitool`, + `diff.tool`, `merge.tool` until a tool is found. --[no-]trust-exit-code:: 'git-difftool' invokes a diff tool individually on each file. diff --git a/builtin/difftool.c b/builtin/difftool.c index 65bba90338..10660639c0 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -24,7 +24,6 @@ #include "object-store.h" #include "dir.h" -static char *diff_gui_tool; static int trust_exit_code; static const char *const builtin_difftool_usage[] = { @@ -34,11 +33,6 @@ static const char *const builtin_difftool_usage[] = { static int difftool_config(const char *var, const char *value, void *cb) { - if (!strcmp(var, "diff.guitool")) { - diff_gui_tool = xstrdup(value); - return 0; - } - if (!strcmp(var, "difftool.trustexitcode")) { trust_exit_code = git_config_bool(var, value); return 0; @@ -734,8 +728,8 @@ int cmd_difftool(int argc, const char **argv, const char *prefix) if (use_gui_tool + !!difftool_cmd + !!extcmd > 1) die(_("--gui, --tool and --extcmd are mutually exclusive")); - if (use_gui_tool && diff_gui_tool && *diff_gui_tool) - setenv("GIT_DIFF_TOOL", diff_gui_tool, 1); + if (use_gui_tool) + setenv("GIT_MERGETOOL_GUI", "true", 1); else if (difftool_cmd) { if (*difftool_cmd) setenv("GIT_DIFF_TOOL", difftool_cmd, 1); diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 107f31213d..ae90701a12 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -279,11 +279,27 @@ test_expect_success 'difftool + mergetool config variables' ' echo branch >expect && git difftool --no-prompt branch >actual && test_cmp expect actual && + git difftool --gui --no-prompt branch >actual && + test_cmp expect actual && # set merge.tool to something bogus, diff.tool to test-tool test_config merge.tool bogus-tool && test_config diff.tool test-tool && git difftool --no-prompt branch >actual && + test_cmp expect actual && + git difftool --gui --no-prompt branch >actual && + test_cmp expect actual && + + # set merge.tool, diff.tool to something bogus, merge.guitool to test-tool + test_config diff.tool bogus-tool && + test_config merge.guitool test-tool && + git difftool --gui --no-prompt branch >actual && + test_cmp expect actual && + + # set merge.tool, diff.tool, merge.guitool to something bogus, diff.guitool to test-tool + test_config merge.guitool bogus-tool && + test_config diff.guitool test-tool && + git difftool --gui --no-prompt branch >actual && test_cmp expect actual ' -- 2.21.0.1000.g11cd861522