From: Junio C Hamano <gitster@pobox.com>
To: "Raymond E. Pasco" <ray@ameretat.dev>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/1] diff-lib: use worktree mode in diffs from i-t-a entries
Date: Sun, 09 Aug 2020 11:09:42 -0700 [thread overview]
Message-ID: <xmqqh7tbelnd.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200808075323.36041-1-ray@ameretat.dev> (Raymond E. Pasco's message of "Sat, 8 Aug 2020 03:53:23 -0400")
"Raymond E. Pasco" <ray@ameretat.dev> writes:
> When creating "new file" diffs against i-t-a index entries, diff-lib
> erroneously used the mode of the cache entry rather than the mode of the
> file in the worktree. This changes run_diff_files() to correctly use the
> mode of the worktree file in this case.
>
> Signed-off-by: Raymond E. Pasco <ray@ameretat.dev>
> ---
> This is a distinct bugfix from the other changes, so I've sent it as a
> separate patch also based on v2.28.0.
>
> diff-lib.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/diff-lib.c b/diff-lib.c
> index 25fd2dee19..50521e2093 100644
> --- a/diff-lib.c
> +++ b/diff-lib.c
> @@ -219,7 +219,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
> continue;
> } else if (revs->diffopt.ita_invisible_in_index &&
> ce_intent_to_add(ce)) {
> - diff_addremove(&revs->diffopt, '+', ce->ce_mode,
> + newmode = ce_mode_from_stat(ce, st.st_mode);
> + diff_addremove(&revs->diffopt, '+', newmode,
> &null_oid, 0, ce->name, 0);
;-)
The ita-invisible-in-index option means that Git must ignore
anything in the index about the entry, other than just the fact that
the path is subject to comparison, so use of ce->ce_mode here is
wrong by definition. Makes sense.
> continue;
> }
next prev parent reply other threads:[~2020-08-09 18:09 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 16:33 [PATCH] apply: Allow "new file" patches on i-t-a entries Raymond E. Pasco
2020-08-04 19:30 ` Junio C Hamano
2020-08-04 20:59 ` Raymond E. Pasco
2020-08-04 22:31 ` [PATCH v2] apply: allow " Raymond E. Pasco
2020-08-04 23:40 ` [PATCH v3] " Raymond E. Pasco
2020-08-04 23:49 ` [PATCH v2] " Junio C Hamano
2020-08-05 0:32 ` Raymond E. Pasco
2020-08-06 6:01 ` [PATCH v4 0/3] apply: handle i-t-a entries in index Raymond E. Pasco
2020-08-06 6:01 ` [PATCH v4 1/3] apply: allow "new file" patches on i-t-a entries Raymond E. Pasco
2020-08-06 6:01 ` [PATCH v4 2/3] apply: make i-t-a entries never match worktree Raymond E. Pasco
2020-08-06 21:00 ` Junio C Hamano
2020-08-06 21:47 ` Raymond E. Pasco
2020-08-06 6:01 ` [PATCH v4 3/3] t4140: test apply with i-t-a paths Raymond E. Pasco
2020-08-06 21:07 ` Junio C Hamano
2020-08-07 3:44 ` Raymond E. Pasco
2020-08-08 7:49 ` [PATCH v5 0/3] apply: handle i-t-a entries in index Raymond E. Pasco
2020-08-08 7:49 ` [PATCH v5 1/3] apply: allow "new file" patches on i-t-a entries Raymond E. Pasco
2020-08-08 13:47 ` Phillip Wood
2020-08-08 7:49 ` [PATCH v5 2/3] apply: make i-t-a entries never match worktree Raymond E. Pasco
2020-08-08 13:46 ` Phillip Wood
2020-08-08 14:07 ` Raymond E. Pasco
2020-08-08 15:48 ` Phillip Wood
2020-08-08 15:58 ` Raymond E. Pasco
2020-08-09 15:25 ` Phillip Wood
2020-08-09 17:58 ` Junio C Hamano
2020-08-10 11:03 ` [PATCH] git-apply.txt: correct description of --cached Raymond E. Pasco
2020-08-10 16:18 ` Junio C Hamano
2020-08-12 13:32 ` Phillip Wood
2020-08-12 19:23 ` Junio C Hamano
2020-08-12 20:52 ` Raymond E. Pasco
2020-08-12 13:59 ` Phillip Wood
2020-08-08 7:49 ` [PATCH v5 3/3] t4140: test apply with i-t-a paths Raymond E. Pasco
2020-08-23 15:58 ` Phillip Wood
2020-08-08 7:53 ` [PATCH 1/1] diff-lib: use worktree mode in diffs from i-t-a entries Raymond E. Pasco
2020-08-08 8:48 ` Martin Ågren
2020-08-08 10:46 ` Raymond E. Pasco
2020-08-08 14:21 ` Martin Ågren
2020-08-09 18:09 ` Junio C Hamano [this message]
2020-08-10 8:53 ` [PATCH] t4069: test diff behavior with i-t-a paths Raymond E. Pasco
2020-08-10 8:57 ` [PATCH] diff-lib: use worktree mode in diffs from i-t-a entries Raymond E. Pasco
2020-08-10 9:03 ` [RESEND PATCH v2] " Raymond E. Pasco
2020-08-10 16:22 ` [PATCH] t4069: test diff behavior with i-t-a paths Junio C Hamano
2020-08-10 16:23 ` Eric Sunshine
2020-08-10 21:47 ` Eric Sunshine
2020-08-10 22:09 ` Junio C Hamano
2020-08-10 22:13 ` Eric Sunshine
2020-08-10 22:22 ` Junio C Hamano
2020-08-10 23:02 ` Raymond E. Pasco
2020-08-10 23:21 ` Eric Sunshine
2020-08-11 3:29 ` Junio C Hamano
2020-08-08 7:58 ` [HYPOTHETICAL PATCH 0/2] apply: reject modification diffs to i-t-a entries Raymond E. Pasco
2020-08-08 7:58 ` [HYPOTHETICAL PATCH 1/2] " Raymond E. Pasco
2020-08-08 7:58 ` [HYPOTHETICAL PATCH 2/2] t4140: test failure of diff from empty blob to i-t-a path Raymond E. Pasco
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=xmqqh7tbelnd.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ray@ameretat.dev \
/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).