From: Phillip Wood <phillip.wood123@gmail.com>
To: Elijah Newren <newren@gmail.com>, Junio C Hamano <gitster@pobox.com>
Cc: Sebastian Thiel <sebastian.thiel@icloud.com>,
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Josh Triplett <josh@joshtriplett.org>
Subject: Re: [PATCH] precious-files.txt: new document proposing new precious file type
Date: Fri, 19 Jan 2024 16:53:50 +0000 [thread overview]
Message-ID: <7fc35078-a165-4b3c-96e2-37fbe55e109d@gmail.com> (raw)
In-Reply-To: <CABPp-BHaUDdtH6igDmOx_wv8xYh-uA=4L9zDDycrZLaa9c9KLQ@mail.gmail.com>
Hi Elijah
On 19/01/2024 02:58, Elijah Newren wrote:
> On Thu, Jan 18, 2024 at 11:14 AM Junio C Hamano <gitster@pobox.com> wrote:
>>
> [...]
>> So, all it boils down to is these two questions.
>
> Thanks for summarizing this.
Yes, thank you Junio - I found it very helpful as well
>> * Which one between "'git add .' adds '.config' that users did not
>> want to add" and "'git clean -f' removes '.config' together with
>> other files" a larger problem to the users, who participate in a
>> project that already decided to use the new .gitignore feature to
>> mark ".config" as "precious", of older versions of Git that
>> predate "precious"?
>
> Accidental "git add ." comes with 3 opportunities to correct the
> problem before it becomes permanent: before commiting, after
> committing but before pushing, and after publishing for patch review
> (where it can even be caught by third parties) but before the
> patch/PR/MR is accepted and included. At each stage there's a chance
> to go back and correct the problem.
If you've added a secret then catching it after you've published the
patch for review is likely to be too late. I agree there are a couple of
chances to catch it before that though.
> Accidental nuking of a file (via either git clean or git checkout or
> git merge or whatever), cannot be reviewed or corrected; it's
> immediately too late.
Indeed, though "git clean" requires the user to pass a flag before it
will delete anything does have a dry-run mode to check what's going to
happen so there is an opportunity for users to avoid accidental deletions.
> [...]
> However, on a closely related note, in my response to Sebastian I
> point out that the '$' syntax permits individual teams to prioritize
> avoiding either accidental deletions or accidental adds on a filename
> or glob granularity, so if folks are concerned with handling by older
> Git versions or are just extra concerned with certain files, they can
> optimize accordingly.
That is an advantage. I do worry that the '$' syntax is unintuitive and
will further add to the impression that git is hard to use. I think the
choice comes down how much we are worried about the way older versions
of git treat ".gitignore" files with the new syntax.
While I can see it would be helpful to settle the syntax question I
think parsing the new syntax is a relatively small part of the work that
needs to be done to implement precious files.
Best Wishes
Phillip
next prev parent reply other threads:[~2024-01-19 16:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-27 2:25 [PATCH] precious-files.txt: new document proposing new precious file type Elijah Newren via GitGitGadget
2023-12-27 5:28 ` Junio C Hamano
2023-12-27 6:54 ` Elijah Newren
2023-12-27 22:15 ` Junio C Hamano
2024-01-18 7:51 ` Sebastian Thiel
2024-01-18 19:14 ` Junio C Hamano
2024-01-18 21:33 ` Sebastian Thiel
2024-01-19 2:37 ` Elijah Newren
2024-01-19 7:51 ` Sebastian Thiel
2024-01-19 18:45 ` Junio C Hamano
2024-01-19 2:58 ` Elijah Newren
2024-01-19 16:53 ` Phillip Wood [this message]
2024-01-19 17:17 ` Junio C Hamano
2024-01-24 6:50 ` Elijah Newren
2024-02-11 22:08 ` Sebastian Thiel
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=7fc35078-a165-4b3c-96e2-37fbe55e109d@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=josh@joshtriplett.org \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sebastian.thiel@icloud.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 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 NNTP newsgroup(s).