From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Bronson Subject: [PATCH v5 3/3] diff: Add diff.orderfile configuration variable Date: Wed, 18 Dec 2013 19:08:12 -0500 Message-ID: <1387411692-15562-4-git-send-email-naesten@gmail.com> References: <1387411692-15562-1-git-send-email-naesten@gmail.com> Cc: Jonathan Nieder , Anders Waldenborg , Antoine Pelisse , Junio C Hamano , Samuel Bronson To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Dec 19 01:19:41 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VtRL1-0003by-4j for gcvg-git-2@plane.gmane.org; Thu, 19 Dec 2013 01:19:39 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752677Ab3LSATf (ORCPT ); Wed, 18 Dec 2013 19:19:35 -0500 Received: from mail-qc0-f177.google.com ([209.85.216.177]:36947 "EHLO mail-qc0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140Ab3LSATe (ORCPT ); Wed, 18 Dec 2013 19:19:34 -0500 Received: by mail-qc0-f177.google.com with SMTP id m20so360295qcx.8 for ; Wed, 18 Dec 2013 16:19:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=lmI/T/WRIAAyLTT6HV+DZG3F77E+bDdb6QHT1NPzrBU=; b=ytxkXLbEqUmm/EAadTeOdZwqqMAOId0aKLmnFq2GnohzgbQYCOcJHJ/ur44OjxTXzj ZBg0G7rXf/jAY8BX08bX5hMQqfLH8gQhg9Zfp0R4RhLZ2qGxelHvCBTlPbiEnrQsbb8b ltcmET4YoC31qGxtchk1uVyHjhwfLcK1EiYhZIjE0kPLZH4VOHLRJUx5hsQDweU6n+j3 MD+3ZwoltbB+L4Z6JnjUvSP9vF7VkA0uxiw4e+VF0rIBAS/m0llB7tQ7icdeYDlyM+dY xymvpPlc5j8GHkATYPPBwC7bEnDYdNzktUdq7QKTYGs9EGCzXwv/SOKJnj2mdrLXv0A8 m/Gw== X-Received: by 10.49.38.37 with SMTP id d5mr58879826qek.17.1387412372337; Wed, 18 Dec 2013 16:19:32 -0800 (PST) Received: from hydrogen (naesten-pt.tunnel.tserv4.nyc4.ipv6.he.net. [2001:470:1f06:57::2]) by mx.google.com with ESMTPSA id o5sm5592005qeg.2.2013.12.18.16.19.31 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 18 Dec 2013 16:19:31 -0800 (PST) Received: from naesten by hydrogen with local (Exim 4.80) (envelope-from ) id 1VtRKs-00046i-Ij; Wed, 18 Dec 2013 19:19:30 -0500 X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1387411692-15562-1-git-send-email-naesten@gmail.com> In-Reply-To: References: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: diff.orderfile acts as a default for the -O command line option. [sb: split up aw's original patch; rework tests and docs, treat option as pathname] Signed-off-by: Anders Waldenborg Signed-off-by: Samuel Bronson --- Documentation/diff-config.txt | 5 +++++ Documentation/diff-options.txt | 3 +++ diff.c | 5 +++++ t/t4056-diff-order.sh | 10 ++++++++++ 4 files changed, 23 insertions(+) diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 223b931..f07b451 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -98,6 +98,11 @@ diff.mnemonicprefix:: diff.noprefix:: If set, 'git diff' does not show any source or destination prefix. +diff.orderfile:: + File indicating how to order files within a diff, using + one shell glob pattern per line. + Can be overridden by the '-O' option to linkgit:git-diff[1]. + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the 'git diff' option '-l'. diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index bbed2cd..9b37b2a 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -432,6 +432,9 @@ endif::git-format-patch[] -O:: Output the patch in the order specified in the , which has one shell glob pattern per line. + This overrides the `diff.orderfile` configuration variable + (see linkgit:git-config[1]). To cancel `diff.orderfile`, + use `-O/dev/null`. ifndef::git-format-patch[] -R:: diff --git a/diff.c b/diff.c index b79432b..f35c83b 100644 --- a/diff.c +++ b/diff.c @@ -30,6 +30,7 @@ static int diff_use_color_default = -1; static int diff_context_default = 3; static const char *diff_word_regex_cfg; static const char *external_diff_cmd_cfg; +static const char *diff_order_file_cfg; int diff_auto_refresh_index = 1; static int diff_mnemonic_prefix; static int diff_no_prefix; @@ -201,6 +202,8 @@ int git_diff_ui_config(const char *var, const char *value, void *cb) return git_config_string(&external_diff_cmd_cfg, var, value); if (!strcmp(var, "diff.wordregex")) return git_config_string(&diff_word_regex_cfg, var, value); + if (!strcmp(var, "diff.orderfile")) + return git_config_pathname(&diff_order_file_cfg, var, value); if (!strcmp(var, "diff.ignoresubmodules")) handle_ignore_submodules_arg(&default_diff_options, value); @@ -3207,6 +3210,8 @@ void diff_setup(struct diff_options *options) options->detect_rename = diff_detect_rename_default; options->xdl_opts |= diff_algorithm; + options->orderfile = diff_order_file_cfg; + if (diff_no_prefix) { options->a_prefix = options->b_prefix = ""; } else if (!diff_mnemonic_prefix) { diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh index 0ac1b95..acd7683 100755 --- a/t/t4056-diff-order.sh +++ b/t/t4056-diff-order.sh @@ -91,6 +91,16 @@ do wait && test_cmp expect_$i actual ' + + test_expect_success "orderfile using config ($i)" ' + git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual && + test_cmp expect_$i actual + ' + + test_expect_success "cancelling configured orderfile ($i)" ' + git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual && + test_cmp expect_none actual + ' done test_done -- 1.8.4.3