From: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] diff-files: treat "i-t-a" files as "not-in-index"
Date: Fri, 19 Jun 2020 15:01:27 +0530 [thread overview]
Message-ID: <20200619093127.GA47528@mail.clickyotomy.dev> (raw)
In-Reply-To: <xmqqbllgknfd.fsf@gitster.c.googlers.com>
Thank you for reviewing this; I appreciate it!
> > + content="foo" &&
> > + echo $content >not-empty &&
>
> The quoting decision is backwards in these two lines. It is OK not
> to quote when the right hand side literal is clearly a single word
> without $IFS. On the other hand, it is a good practice to always
> quote when using what is in a "$variable".
Yes, that doesn't look right, I will make changes in v2.
[...]
> > > + touch empty &&
> >
> > Use of "touch" gives a wrong impression that you care about the file
> > timestamp; use something like ": >empty &&" instead when you care
> > about the presence of the file and do not care about its timestamp.
>
> I just realized that this is even more important in this case not to
> use "touch".
>
> The test that uses this file cares not just the presence, but it
> deeply cares that its contents is empty. The thing it least cares
> about is its timestamp.
>
> The purpose of using "touch" is to update the timestamp, to keep the
> current contents if it exists, and to ensure it exists (as a side
> effect), in the decreasing order of importance. Use of the command
> here misleads the readers.
Oops, you are right. That makes sense. Will update to ": >empty".
[...]
> > + git add -N empty not-empty &&
> > + git diff-files -p >actual &&
> > + hash_e=$(git hash-object empty) &&
> > + hash_n=$(git hash-object not-empty) &&
> > + cat >expect <<-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
> > + test_cmp expect actual
> > +'
>
> OK. Do we want to show what happens when "diff" and "diff --cached"
> are run with these two "added but not quite added yet" paths to
> contrast with this new case?
I'm not sure if we want to repeat an older test. The test (which was
renamed in this patch) in t2203-add-intent.sh: "diff/diff-cached shows
ita as new/not-new files" is already doing that. Should the "diff" and
"diff --cached" steps be appended here again?
Thanks.
next prev parent reply other threads:[~2020-06-19 9:34 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 [this message]
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
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=20200619093127.GA47528@mail.clickyotomy.dev \
--to=shrinidhi.kaushik@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.