From: Junio C Hamano <gitster@pobox.com>
To: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] diff-files: treat "i-t-a" files as "not-in-index"
Date: Sat, 20 Jun 2020 09:54:16 -0700 [thread overview]
Message-ID: <xmqqsgepekzr.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200620163845.871-1-shrinidhi.kaushik@gmail.com> (Srinidhi Kaushik's message of "Sat, 20 Jun 2020 22:08:45 +0530")
Srinidhi Kaushik <shrinidhi.kaushik@gmail.com> writes:
> The `diff-files' command and related commands which call the function
> `cmd_diff_files()', consider the "intent-to-add" files as a part of the
> index when comparing the work-tree against it. This was previously
> addressed in commits [1] and [2] by turning the option
> `--ita-invisible-in-index' (introduced in [3]) on by default.
>
> For `diff-files' (and `add -p' as a consequence) to show the i-t-a
> files as as new, `ita_invisible_in_index' will be enabled by default
> here as well.
>
> [1] 0231ae71d3 (diff: turn --ita-invisible-in-index on by default,
> 2018-05-26)
> [2] 425a28e0a4 (diff-lib: allow ita entries treated as "not yet exist
> in index", 2016-10-24)
> [3] b42b451919 (diff: add --ita-[in]visible-in-index, 2016-10-24)
>
> Signed-off-by: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
> ---
Thanks.
> -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 &&
> + : >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) &&
> +
> + 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
This is good, but just FYI you did not have to use printf --- "<<-"
treats only leading tab specially, and not in the middle of a line.
> + EOF
> +
> + git add -N empty not-empty &&
OK. So with two paths...
> +
> + git diff >actual &&
> + test_cmp expect.diff_p actual &&
... the patch output of "git diff", and
> git diff --summary >actual &&
... the summary part, and
> - 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 &&
... the same for "diff-files" and
> + git diff --cached >actual &&
... "diff -cached" are all checked.
Looking good.
> + test_must_be_empty actual
> +'
>
> test_expect_success '"diff HEAD" includes ita as new files' '
> git reset --hard &&
> --
> 2.27.0
next prev parent reply other threads:[~2020-06-20 16:54 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 [this message]
2020-06-23 15:17 ` Johannes Schindelin
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=xmqqsgepekzr.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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).