From: "Dmitry Kakurin" <dmitry.kakurin@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Jan Hudec" <bulb@ucw.cz>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Petr Baudis" <pasky@suse.cz>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: .gitignore, .gitattributes, .gitmodules, .gitprecious?,.gitacls? etc.
Date: Wed, 5 Sep 2007 01:31:33 -0700 [thread overview]
Message-ID: <a1bbc6950709050131g397f1ef0p999681f8d13a8a42@mail.gmail.com> (raw)
In-Reply-To: <7vk5r5jzpn.fsf@gitster.siamese.dyndns.org>
On 9/5/07, Junio C Hamano <gitster@pobox.com> wrote:
> "Dmitry Kakurin" <dmitry.kakurin@gmail.com> writes:
>
> > I assert that since index does not have .gitattributes the one from
> > local directory should not be used.
> >
> > Think about dedicated build machine scenario: I have a machine that
> > always does sync + build. After every sync the local directory should
> > always be identical to what-was-committed.
>
> Thinking about the reason _why_ .gitattributes may be updated,
> one would notice that it is because somebody did this command
> sequence:
>
> git checkout ;# now work tree is clean
> edit .gitattributes ;# modify the attributes of a file
> edit file ;# edit the file attributes talks about
> git add file ;# this can be affected by .gitattributes
> git add .gitattributes ;# this is changed in the same commit
> git commit
>
> Now, should we always take .gitattributes from the index?
No, from couple of my emails back:
> This leads to a simple idea that mostly works:
> 1. when files are moved from index to filesystem, then only .gitattributes in the index is used, if it's not there == no special attributes.
> 2. when files are moved from filesystem to index, then only .gitattributes in filesystem is used, again if it's not there == no special attributes.
>
> Then, in any operation, only one .gitattributes is taken into account.
This is a must-do change (IMHO).
To go one step further (again IMHO) is to eliminate workspace version
of .gitattributes all together:
> We could stop here, but to me this redundancy still has some room for confusion and looks unnecessary.
> Plus there is still room for unintentional abuse (by mistake).
> That's why I think it's a good idea to always have only one .gitattributes (in the index).
--
- Dmitry
next prev parent reply other threads:[~2007-09-05 8:31 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-26 2:59 .gitignore, .gitattributes, .gitmodules, .gitprecious?, .gitacls? etc Dmitry Kakurin
2007-08-26 4:37 ` Junio C Hamano
2007-08-26 5:17 ` Dmitry Kakurin
2007-08-26 5:33 ` Junio C Hamano
2007-08-26 6:36 ` Dmitry Kakurin
2007-08-26 7:28 ` Junio C Hamano
2007-08-26 8:02 ` Dmitry Kakurin
2007-08-26 10:06 ` Petr Baudis
[not found] ` <4C603F7C51884DF8AFAEC3F6E263798D@ntdev.corp.microsoft.com>
2007-08-27 20:27 ` .gitignore, .gitattributes, .gitmodules, .gitprecious?,.gitacls? etc Dmitry Kakurin
[not found] ` <Pine.LNX.4.64.0708280945350.28586@racer.site>
2007-09-04 20:23 ` Jan Hudec
2007-09-05 8:06 ` Dmitry Kakurin
2007-09-05 8:14 ` Junio C Hamano
2007-09-05 8:31 ` Dmitry Kakurin [this message]
2007-09-05 18:38 ` Jan Hudec
2007-08-27 2:51 ` .gitignore, .gitattributes, .gitmodules, .gitprecious?, .gitacls? etc Sam Vilain
2007-08-27 5:52 ` David Kastrup
2007-08-27 10:56 ` Sam Vilain
2007-08-27 11:26 ` David Kastrup
2007-08-27 11:30 ` Johannes Schindelin
[not found] ` <46D33A15.1000003@vilain.net>
[not found] ` <Pine.LNX.4.64.0708280942360.28586@racer.site>
[not found] ` <46D4A4F8.9040004@vilain.net>
[not found] ` <Pine.LNX.4.64.0708290007020.28586@racer.site>
2007-09-04 20:49 ` Jan Hudec
2007-08-26 15:05 ` Johannes Schindelin
2007-08-27 11:35 ` martin f krafft
2007-08-27 15:34 ` Sergio Callegari
2007-08-27 15:48 ` David Kastrup
2007-08-27 16:54 ` Petr Baudis
2007-08-27 17:22 ` Sergio Callegari
2007-08-27 17:07 ` Sergio Callegari
2007-09-04 21:03 ` Jan Hudec
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=a1bbc6950709050131g397f1ef0p999681f8d13a8a42@mail.gmail.com \
--to=dmitry.kakurin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bulb@ucw.cz \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pasky@suse.cz \
/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).