From: Junio C Hamano <gitster@pobox•com>
To: Michael J Gruber <git@drmicha•warpmail.net>
Cc: git@vger•kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Subject: Re: [PATCH] t2203,t4011: adjust to changed intent-to-add treatment
Date: Sun, 15 Mar 2015 00:07:44 -0700 [thread overview]
Message-ID: <xmqqegoqviv3.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <40da6c2f97f836acbaa654f470a007e06a47a22e.1425915714.git.git@drmicha.warpmail.net> (Michael J. Gruber's message of "Mon, 9 Mar 2015 16:45:25 +0100")
Michael J Gruber <git@drmicha•warpmail.net> writes:
> Signed-off-by: Michael J Gruber <git@drmicha•warpmail.net>
> ---
> For the record, the tests would need to change like this, and it makes
> a lot of sense. After the change, "i-t-a" is not a "change staged in
> the index" any more - and in fact in never was, as "git commit" shows.
Perhaps another follow-up patch can illustrate how these entries
should show "git status", both in the longform and -s output?
>
> t/t2203-add-intent.sh | 7 ++++---
> t/t4011-diff-symlink.sh | 10 ++++++----
> 2 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
> index 2a4a749..1a9b3c4 100755
> --- a/t/t2203-add-intent.sh
> +++ b/t/t2203-add-intent.sh
> @@ -43,7 +43,8 @@ test_expect_success 'i-t-a entry is simply ignored' '
> git add -N nitfol &&
> git commit -m second &&
> test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
> - test $(git diff --name-only HEAD -- nitfol | wc -l) = 1
> + test $(git diff --name-only HEAD -- nitfol | wc -l) = 0 &&
> + test $(git diff --name-only -- nitfol | wc -l) = 1
> '
>
> test_expect_success 'can commit with an unrelated i-t-a entry in index' '
> @@ -71,13 +72,13 @@ test_expect_success 'cache-tree invalidates i-t-a paths' '
>
> : >dir/bar &&
> git add -N dir/bar &&
> - git diff --cached --name-only >actual &&
> + git diff --name-only >actual &&
> echo dir/bar >expect &&
> test_cmp expect actual &&
>
> git write-tree >/dev/null &&
>
> - git diff --cached --name-only >actual &&
> + git diff --name-only >actual &&
> echo dir/bar >expect &&
> test_cmp expect actual
> '
> diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
> index 13e7f62..7452fce 100755
> --- a/t/t4011-diff-symlink.sh
> +++ b/t/t4011-diff-symlink.sh
> @@ -139,11 +139,13 @@ test_expect_success SYMLINKS 'setup symlinks with attributes' '
> test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' '
> cat >expect <<-\EOF &&
> diff --git a/file.bin b/file.bin
> - index e69de29..d95f3ad 100644
> - Binary files a/file.bin and b/file.bin differ
> + new file mode 100644
> + index 0000000..d95f3ad
> + Binary files /dev/null and b/file.bin differ
> diff --git a/link.bin b/link.bin
> - index e69de29..dce41ec 120000
> - --- a/link.bin
> + new file mode 120000
> + index 0000000..dce41ec
> + --- /dev/null
> +++ b/link.bin
> @@ -0,0 +1 @@
> +file.bin
prev parent reply other threads:[~2015-03-15 7:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-09 14:14 [PATCH/RFC 0/2] Bug fixes regarding diff and "git add -N" Nguyễn Thái Ngọc Duy
2015-03-09 14:14 ` [PATCH 1/2] diff --cached: do not report i-t-a entries as "new" Nguyễn Thái Ngọc Duy
2015-03-15 6:55 ` Junio C Hamano
2015-03-16 13:56 ` [PATCH v2] diff-lib.c: adjust position of i-t-a entries in diff Nguyễn Thái Ngọc Duy
2015-03-16 15:15 ` Michael J Gruber
2015-03-16 16:05 ` Junio C Hamano
2015-03-17 14:07 ` Duy Nguyen
2015-03-17 17:57 ` Junio C Hamano
2015-03-18 12:47 ` Duy Nguyen
2015-03-18 20:30 ` Junio C Hamano
2015-03-19 6:00 ` Junio C Hamano
2015-03-24 1:15 ` Duy Nguyen
2015-03-24 17:00 ` Junio C Hamano
2015-03-23 20:52 ` Junio C Hamano
2015-03-09 14:14 ` [PATCH 2/2] diff-files: mark i-t-a paths as "new" Nguyễn Thái Ngọc Duy
2015-03-15 7:05 ` Junio C Hamano
2015-03-09 15:45 ` [PATCH] t2203,t4011: adjust to changed intent-to-add treatment Michael J Gruber
2015-03-15 7:07 ` Junio C Hamano [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqegoqviv3.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox