From: Eric Sunshine <sunshine@sunshineco.com>
To: Laurent Arnoud <laurent@spkdev.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Git List" <git@vger.kernel.org>
Subject: Re: [PATCH v5] diff: add config option relative
Date: Mon, 18 May 2020 12:19:20 -0400 [thread overview]
Message-ID: <CAPig+cRNCdtK9SSMSXj83tTCV1n+YW3-a0EnfM_VVVCry8rXCg@mail.gmail.com> (raw)
In-Reply-To: <20200518094021.GA2069@spk-laptop>
On Mon, May 18, 2020 at 5:40 AM Laurent Arnoud <laurent@spkdev.net> wrote:
> 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>
> ---
> diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
> +check_diff_relative_option () {
> + dir=$1
> + shift
> + expect=$1
> + shift
> + relative_opt=$1
> + shift
> + short_blob=$(git rev-parse --short "$blob_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 diff.relative $relative_opt -p $*" "
> + test_config -C $dir diff.relative $relative_opt &&
> + git -C '$dir' diff -p $* HEAD^ >actual &&
> + test_cmp expected actual
> + "
> +}
Let's move all the setup code into the test itself so that a failure
of git-rev-parse will be caught. For instance:
check_diff_relative_option () {
dir=$1
shift
expect=$1
shift
relative_opt=$1
shift
test_expect_success "config diff.relative $relative_opt -p $*" "
short_blob=$(git rev-parse --short $blob_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_config -C $dir diff.relative $relative_opt &&
git -C '$dir' diff -p $* HEAD^ >actual &&
test_cmp expected actual
"
}
Same comment applies to the other new function added by this patch.
next prev parent reply other threads:[~2020-05-18 16:19 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
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 [this message]
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=CAPig+cRNCdtK9SSMSXj83tTCV1n+YW3-a0EnfM_VVVCry8rXCg@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=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).