From mboxrd@z Thu Jan 1 00:00:00 1970 From: kelson@shysecurity.com Subject: [PATCH v3 2/2] git-config support for diff.relative setting Date: Sun, 21 Dec 2014 15:23:15 -0500 Message-ID: <54972C33.4030009@shysecurity.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Cc: Junio C Hamano , Philip Oakley , Duy Nguyen , Jonathan Nieder To: Git Mailing List X-From: git-owner@vger.kernel.org Sun Dec 21 21:23:30 2014 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 1Y2n2H-0008RB-H9 for gcvg-git-2@plane.gmane.org; Sun, 21 Dec 2014 21:23:29 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752720AbaLUUXZ (ORCPT ); Sun, 21 Dec 2014 15:23:25 -0500 Received: from mail-qg0-f41.google.com ([209.85.192.41]:54729 "EHLO mail-qg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752438AbaLUUXY (ORCPT ); Sun, 21 Dec 2014 15:23:24 -0500 Received: by mail-qg0-f41.google.com with SMTP id e89so846328qgf.14 for ; Sun, 21 Dec 2014 12:23:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=zjhVun2RIiyZol9nr+7n60aqhafdHfQz+okVOaplYpI=; b=jzs/9g8ZmRznecmrNO19ntB6p8EA20GdY8g7DsBrlWPFNvtnOKtLMmlACJfmW3XZJ2 bE3CMsbanxP0wY73lYySDLYBJrdTFPthNSt/qzWwe7FCnqvQNk7GdowPjDapPjcF/sio pxqPBLi5kDyfAad7vNHdVx/7Jt2pgk/HRtJcT12sHpdyqVmDrW75P//IGz+yLVDse4Lq HyYlg0dfFLOFnweapt52+5X6PvV17DyTvSKvkjhZPGRaPrAs4jPUPXW7Cke3ACSsVMYN 9Vf6Vg+BmTjUvSc5ESClwxTF6KPguFnl1YEF8LlzoLsURoeoedFqOuwf2Qjrll+4onel tNFA== X-Gm-Message-State: ALoCoQnK8WX3iPUazLc55PcXsdBosmXpTCi/FSb8dPnS9/RYh3Vk/4HXyStmPaQNKygn3LC50MDK X-Received: by 10.229.249.68 with SMTP id mj4mr31500404qcb.23.1419193403777; Sun, 21 Dec 2014 12:23:23 -0800 (PST) Received: from [10.0.0.22] (pool-100-36-60-151.washdc.fios.verizon.net. [100.36.60.151]) by mx.google.com with ESMTPSA id s1sm14834574qak.43.2014.12.21.12.23.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Dec 2014 12:23:23 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: added support for `git diff --no-relative` (code, documentation, and tests) git-diff --no-relative overrides diff.relative config setting and prior git-diff --relative[=] options. --- Documentation/diff-config.txt | 1 + Documentation/diff-options.txt | 4 +++ diff.c | 2 ++ t/t4045-diff-relative.sh | 56 +++++++++++++++++++++++++++++++++--------- 4 files changed, 51 insertions(+), 12 deletions(-) diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 496e9b0..b8a7c60 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -107,6 +107,7 @@ diff.relative:: Show pathnames relative to the current directory and exclude changes outside this directory; equivalent to the 'git diff' option '--relative'. + Overridden by the '--no-relative' linkgit:git-diff[1] option. diff.renameLimit:: The number of files to consider when performing the copy/rename diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 6cb083a..7470b16 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -448,6 +448,10 @@ ifndef::git-format-patch[] not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a as an argument. + +--no-relative:: + Turn off relative pathnames, even when the configuration + file gives the default to do so. endif::git-format-patch[] -a:: diff --git a/diff.c b/diff.c index 03697a9..9e4ec1f 100644 --- a/diff.c +++ b/diff.c @@ -3703,6 +3703,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) DIFF_OPT_SET(options, RELATIVE_NAME); options->prefix = arg; } + else if (!strcmp(arg, "--no-relative")) + DIFF_OPT_CLR(options, RELATIVE_NAME); /* xdiff options */ else if (!strcmp(arg, "--minimal")) diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh index 8c8fe0b..b2764d5 100755 --- a/t/t4045-diff-relative.sh +++ b/t/t4045-diff-relative.sh @@ -12,8 +12,8 @@ test_expect_success 'setup' ' git commit -m one ' -check_diff() { -expect=$1; shift +store_diff_relative() { +expect=$1; cat >expected <actual && - test_cmp expected actual -" } -check_config() { -expect=$1; shift +store_diff_absolute() { +expect=$1; cat >expected <actual && + test_cmp expected actual +" +} + +check_option_no_relative() { +store_diff_absolute $1; shift +test_expect_success "-p $* --no-relative" " + git diff -p $* HEAD^ --no-relative >actual && + test_cmp expected actual +" +} + +check_config() { +store_diff_relative $1; shift test_expect_success "git-config diff.relative=true in $1" " (cd $1; git -c diff.relative=true diff -p HEAD^ >../actual) && test_cmp expected actual " } +check_config_no_relative() { +store_diff_absolute $1; shift +test_expect_success "--no-relative w/ git-config diff.relative=true in $1" " + (cd $1; git -c diff.relative=true diff --no-relative -p HEAD^ >../actual) && + test_cmp expected actual +" +} + + check_numstat() { expect=$1; shift cat >expected <