From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: Laurent Arnoud <laurent@spkdev.net>
Cc: phillip.wood@dunelm.org.uk, Junio C Hamano <gitster@pobox.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
git@vger.kernel.org
Subject: Re: [PATCH v4] diff: add config option relative
Date: Sun, 17 May 2020 09:14:52 +0700 [thread overview]
Message-ID: <20200517021452.GA2114@danh.dev> (raw)
In-Reply-To: <20200516194033.GA2252@spk-laptop>
Hi Laurent,
On 2020-05-16 21:40:33+0200, Laurent Arnoud <laurent@spkdev.net> wrote:
> Subject: Re: [PATCH v4] diff: add config option relative
I think the subject should be changed to.
diff: allow overriding --relative
> The `diff.relative` boolean option set to `true` show only changes on
> the current directory and show relative pathnames to the current
> directory.
>
> Teach --no-relative to override earlier --relative
>
> Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
> ---
> Documentation/config/diff.txt | 4 ++
> Documentation/diff-options.txt | 3 ++
> diff.c | 16 ++++--
> t/t9904-diff-relative-config.sh | 93 +++++++++++++++++++++++++++++++++
I think t99?? is used for miscellaneous tests.
To me, diff-relative things should be tested in t4045-diff-relative.sh
> 4 files changed, 113 insertions(+), 3 deletions(-)
> create mode 100755 t/t9904-diff-relative-config.sh
>
> diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
> index ff09f1cf73..76537c3b0c 100644
> --- a/Documentation/config/diff.txt
> +++ b/Documentation/config/diff.txt
> @@ -105,6 +105,10 @@ diff.mnemonicPrefix::
> diff.noprefix::
> If set, 'git diff' does not show any source or destination prefix.
>
> +diff.relative::
> + If set to "true", 'git diff' does not show changes outside of the directory
I think it's better to change "true" to either:
'true' (generated to <em>true</em>, or
`true` generated to <code>true<code>
Not sure which one is prefered, though.
This file uses both 2 styles.
I _think_ `true` is preferred.
> + and show pathnames relative to the current directory.
> +
> diff.orderFile::
> File indicating how to order files within a diff.
> See the '-O' option to linkgit:git-diff[1] for details.
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index bb31f0c42b..1b279904eb 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -651,6 +651,9 @@ 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 <path> as an argument.
> +--no-relative::
Please merge this option with `--relative[=<path>]` above.
And says something likes:
`--no-relative` can be used to countermand
both `diff.relative` and previous `--relative`
> @@ -5195,8 +5202,11 @@ static int diff_opt_relative(const struct option *opt,
> {
> struct diff_options *options = opt->value;
>
> - BUG_ON_OPT_NEG(unset);
> - options->flags.relative_name = 1;
> + if (unset) {
> + options->flags.relative_name = 0;
> + } else {
> + options->flags.relative_name = 1;
> + }
Can this block be simplified as:
options->flags.relative_name = !unset;
> +check_diff_relative () {
> + dir=$1
> + shift
> + expect=$1
> + shift
> + relative_opt=$1
> + shift
> + short_blob=$(git rev-parse --short "$(git hash-object subdir/file2)")
I think current practice want to have git hash-object as separated.
And all git-related code moved inside test_expect*
diff --git a/t/t9904-diff-relative-config.sh b/t/t9904-diff-relative-config.sh
index 23ab1af5e0..4747647917 100755
--- a/t/t9904-diff-relative-config.sh
+++ b/t/t9904-diff-relative-config.sh
@@ -20,17 +20,18 @@ check_diff_relative () {
shift
relative_opt=$1
shift
- short_blob=$(git rev-parse --short "$(git hash-object subdir/file2)")
- cat >expected <<-EOF
- diff --git a/$expect b/$expect
- new file mode 100644
- index 0000000..$short_blob
- --- /dev/null
- +++ b/$expect
- @@ -0,0 +1 @@
- +other content
- EOF
- test_expect_success "config.relative $relative_opt -p $*" "
+ test_expect_success "config.relative $relative_opt -p $* in $dir" "
+ hash=\$(git hash-object subdir/file2) &&
+ short_blob=\$(git rev-parse --short \$hash) &&
+ cat >expected <<-EOF &&
+ diff --git a/$expect b/$expect
+ new file mode 100644
+ index 0000000..\$short_blob
+ --- /dev/null
+ +++ b/$expect
+ @@ -0,0 +1 @@
+ +other content
+ EOF
test_config -C $dir diff.relative $relative_opt &&
git -C '$dir' diff -p $* HEAD^ >actual &&
test_cmp expected actual
> + short_blob_file1=$(git rev-parse --short "$(git hash-object file1)")
> + short_blob_file2=$(git rev-parse --short "$(git hash-object subdir/file2)")
> + cat >expected <<-EOF
> + diff --git a/file1 b/file1
> + new file mode 100644
> + index 0000000..$short_blob_file1
> + --- /dev/null
> + +++ b/file1
> + @@ -0,0 +1 @@
> + +content
> + diff --git a/$expect b/$expect
> + new file mode 100644
> + index 0000000..$short_blob_file2
> + --- /dev/null
> + +++ b/$expect
> + @@ -0,0 +1 @@
> + +other content
> + EOF
> + cat expected
Above comment also applied here.
And remove this debug cat.
--
Danh
next prev parent reply other threads:[~2020-05-17 2:15 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 15:57 [PATCH] diff: add config option relative Laurent Arnoud
2020-05-15 22:22 ` Philip Oakley
2020-05-16 17:30 ` Laurent Arnoud
2020-05-15 23:31 ` brian m. carlson
2020-05-16 0:04 ` Junio C Hamano
2020-05-16 17:35 ` Laurent Arnoud
2020-05-16 17:38 ` [PATCH v3] " Laurent Arnoud
2020-05-16 18:33 ` Phillip Wood
2020-05-16 19:40 ` [PATCH v4] " Laurent Arnoud
2020-05-17 2:14 ` Đoàn Trần Công Danh [this message]
2020-05-17 2:48 ` Danh Doan
2020-05-17 15:12 ` Junio C Hamano
2020-05-18 9:40 ` [PATCH v5] " Laurent Arnoud
2020-05-18 11:46 ` Shourya Shukla
2020-05-18 13:04 ` Đoàn Trần Công Danh
2020-05-18 17:25 ` Laurent Arnoud
2020-05-18 13:56 ` Đoàn Trần Công Danh
2020-05-18 16:57 ` Junio C Hamano
2020-05-18 19:12 ` Đoàn Trần Công Danh
2020-05-18 20:37 ` Junio C Hamano
2020-05-19 0:30 ` Đoàn Trần Công Danh
2020-05-19 18:00 ` Junio C Hamano
2020-05-19 19:39 ` [PATCH v7] " Laurent Arnoud
2020-05-19 23:01 ` Đoàn Trần Công Danh
2020-05-22 10:46 ` [PATCH v8] " Laurent Arnoud
2020-05-23 2:14 ` Đoàn Trần Công Danh
2020-05-22 10:48 ` [PATCH v7] " Laurent Arnoud
2020-05-18 17:03 ` [PATCH v5] " Junio C Hamano
2020-05-18 17:21 ` [PATCH v6] " Laurent Arnoud
2020-05-18 17:31 ` Junio C Hamano
2020-05-18 17:33 ` Junio C Hamano
2020-05-18 17:34 ` Eric Sunshine
2020-05-18 19:19 ` Đoàn Trần Công Danh
2020-05-18 20:02 ` Junio C Hamano
2020-05-18 17:32 ` [PATCH v5] " Laurent Arnoud
2020-05-18 16:19 ` Eric Sunshine
2020-05-18 17:26 ` Laurent Arnoud
2020-05-18 9:43 ` [PATCH v4] " Laurent Arnoud
2020-05-17 15:07 ` [PATCH v3] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200517021452.GA2114@danh.dev \
--to=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=laurent@spkdev.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).