From: "Dmitry Kakurin" <dmitry.kakurin@gmail.com>
To: "Jan Hudec" <bulb@ucw.cz>
Cc: "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:06:03 -0700 [thread overview]
Message-ID: <a1bbc6950709050106j137215obd7272b2a77c3b13@mail.gmail.com> (raw)
In-Reply-To: <20070904202326.GC3786@efreet.light.src>
On 9/4/07, Jan Hudec <bulb@ucw.cz> wrote:
> On Tue, Aug 28, 2007 at 09:49:47 +0100, Johannes Schindelin wrote:
> > On Mon, 27 Aug 2007, Dmitry Kakurin wrote:
> >
> > > Here is the problem: we need to apply crlf attributes to a file. We
> > > could have .gitattributes both in the index and in the worktree.
> > > Which one do we use?
> > > In general .gitattributes file could be (U)nchanged, (C)hanged, (NP)
> > > NotPresent in each place.
> >
> > I do not see these cases. You can have these cases, basically:
> >
> > - .gitattributes in worktree (then it does not matter what else we have),
> > - .gitattributes not in the worktree, but in the index (then that is taken)
> >
> > In the latter case, there could be conflicts _in_ .gitattributes, in which
> > case those .gitattributes are ignored.
> >
> > I do not see any problem with that.
>
> I do.
>
> IMNSHO it should be the other way around:
> .gitattributes in index, than index version is used.
> .gitattributes not in index, but in worktree, than that tree version is used.
Consider scenario when my commit #1 has .gitattributes:
a.txt -nocrlf
and file a.txt
You pull it.
Now I make some changes to a.txt and realize that a.txt *is* a text
file now. I remove the entry from .gitattributes and notice that it
becomes empty. So I just remove .gitattributes file all together. It
becomes commit#2.
Now you pull it again. There *is* .gitattributes in local directory,
but index does not have it (because I've removed it on purpose). What
should happen?
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.
With every commit 3 things could happen: .gitattributes could appear,
disappear or change. In every case "build machine" must produce the
exact copy of what-was-checked-in. The only way I see this happening
is by using *only* index version of .gitattributes when files are
moved index -> workspace.
A similar reasoning works for other direction (workplace -> index).
--
- Dmitry
next prev parent reply other threads:[~2007-09-05 8:06 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 [this message]
2007-09-05 8:14 ` Junio C Hamano
2007-09-05 8:31 ` Dmitry Kakurin
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=a1bbc6950709050106j137215obd7272b2a77c3b13@mail.gmail.com \
--to=dmitry.kakurin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bulb@ucw.cz \
--cc=git@vger.kernel.org \
--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).