From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] diff-files: treat "i-t-a" files as "not-in-index"
Date: Tue, 23 Jun 2020 17:17:12 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2006231714450.54@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200620163845.871-1-shrinidhi.kaushik@gmail.com>
Hi Srinidhi,
On Sat, 20 Jun 2020, Srinidhi Kaushik wrote:
> diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
> index 5bbe8dcce4..8a5d55054f 100755
> --- a/t/t2203-add-intent.sh
> +++ b/t/t2203-add-intent.sh
> @@ -232,17 +232,54 @@ test_expect_success 'double rename detection in status' '
> )
> '
>
> -test_expect_success 'diff-files/diff-cached shows ita as new/not-new files' '
> +test_expect_success 'i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"' '
> git reset --hard &&
> - echo new >new-ita &&
> - git add -N new-ita &&
> + : >empty &&
> + content="foo" &&
> + echo "$content" >not-empty &&
> +
> + hash_e=$(git hash-object empty) &&
> + hash_n=$(git hash-object not-empty) &&
> + hash_t=$(git hash-object -t tree /dev/null) &&
So this is the hash of the empty tree object, and...
> +
> + cat >expect.diff_p <<-EOF &&
> + diff --git a/empty b/empty
> + new file mode 100644
> + index 0000000..$(git rev-parse --short $hash_e)
> + diff --git a/not-empty b/not-empty
> + new file mode 100644
> + index 0000000..$(git rev-parse --short $hash_n)
> + --- /dev/null
> + +++ b/not-empty
> + @@ -0,0 +1 @@
> + +$content
> + EOF
> + cat >expect.diff_s <<-EOF &&
> + create mode 100644 empty
> + create mode 100644 not-empty
> + EOF
> + cat >expect.diff_a <<-EOF &&
> + :000000 100644 0000000 $(git rev-parse --short $hash_t) A$(printf "\t")empty
> + :000000 100644 0000000 $(git rev-parse --short $hash_t) A$(printf "\t")not-empty
... here we expect `git diff --raw` to claim that the contents of `empty`
and of `non-empty` are actually the empty tree.
The underlying problem is that some time ago, the (already incorrect)
empty blob constant was replaced by the empty tree constant, by mistake. I
contributed a patch series to fix that, and Cc:ed you you in v2 that I
sent out earlier today.
It would be helpful if you reviewed it carefully, as you are already
familiar with the code in question.
Thank you,
Johannes
> + EOF
> +
> + git add -N empty not-empty &&
> +
> + git diff >actual &&
> + test_cmp expect.diff_p actual &&
> +
> git diff --summary >actual &&
> - echo " create mode 100644 new-ita" >expected &&
> - test_cmp expected actual &&
> - git diff --cached --summary >actual2 &&
> - test_must_be_empty actual2
> -'
> + test_cmp expect.diff_s actual &&
> +
> + git diff-files -p >actual &&
> + test_cmp expect.diff_p actual &&
>
> + git diff-files --abbrev >actual &&
> + test_cmp expect.diff_a actual &&
> +
> + git diff --cached >actual &&
> + test_must_be_empty actual
> +'
>
> test_expect_success '"diff HEAD" includes ita as new files' '
> git reset --hard &&
> --
> 2.27.0
>
>
prev parent reply other threads:[~2020-06-23 15:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 16:16 [PATCH] diff-files: treat "i-t-a" files as "not-in-index" Srinidhi Kaushik
2020-06-11 20:27 ` Junio C Hamano
2020-06-11 23:28 ` Srinidhi Kaushik
2020-06-18 17:58 ` Srinidhi Kaushik
2020-06-18 22:33 ` Junio C Hamano
2020-06-18 22:33 ` Junio C Hamano
2020-06-18 22:40 ` Junio C Hamano
2020-06-19 9:31 ` Srinidhi Kaushik
2020-06-19 21:43 ` Junio C Hamano
2020-06-20 16:38 ` [PATCH v2] " Srinidhi Kaushik
2020-06-20 16:54 ` Junio C Hamano
2020-06-23 15:17 ` Johannes Schindelin [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
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=nycvar.QRO.7.76.6.2006231714450.54@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=shrinidhi.kaushik@gmail.com \
/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).