git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Finn Arne Gangstad <finnag@pvv.org>
To: "Henrik Grubbström" <grubba@roxen.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org
Subject: Re: [PATCH v4 0/5] Patches to avoid reporting conversion changes.
Date: Mon, 7 Jun 2010 21:50:13 +0200	[thread overview]
Message-ID: <20100607195013.GA27362@pvv.org> (raw)
In-Reply-To: <Pine.GSO.4.63.1006071726170.22466@shipon.roxen.com>

On Mon, Jun 07, 2010 at 06:37:56PM +0200, Henrik Grubbström wrote:
>
> On Mon, 7 Jun 2010, Finn Arne Gangstad wrote:
>
>> I think it would be best if git at this time could decide that the
>> affected files also become dirty. The ideal commit is one that
>> both alters the .gitattributes _and_ the affected files at the same
>> time, and git should make it easy to create that commit.
>
> I agree in the case of newly added attributes. In the case of 
> repositories already containing unnormalized files this however leads to 
> problems.
> eg
>
>   Consider the case above, but a while later when the repository has been
>   fixed at HEAD. If an old version from before the normalization is
>   checked out, the index will once again become dirty, which means that
>   git will refuse the user to check out some other version unless the
>   --force flag is given. Excessive use of --force is not a good thing.
>   If the user is aware of the problem, and checking out old versions is
>   a common operation, toggling the suggested option might be a good
>   solution.

Maybe I misunderstand something, but if you check out an older
version, the .gitattributes file will change to match the old version.
The old version should not have the conversion attributes set, and
should therefore result in a clean checkout?

- Finn Arne

  reply	other threads:[~2010-06-07 19:50 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-01 14:41 [PATCH v4 0/5] Patches to avoid reporting conversion changes Henrik Grubbström (Grubba)
2010-06-01 14:41 ` [PATCH v4 1/5] sha1_file: Add index_blob() Henrik Grubbström (Grubba)
2010-06-01 14:41 ` [PATCH v4 2/5] strbuf: Add strbuf_add_uint32() Henrik Grubbström (Grubba)
2010-06-01 14:41 ` [PATCH v4 3/5] cache: Keep track of conversion mode changes Henrik Grubbström (Grubba)
2010-06-01 14:41 ` [PATCH v4 4/5] cache: Add index extension "CONV" Henrik Grubbström (Grubba)
2010-06-01 14:41 ` [PATCH v4 5/5] t/t0021: Test that conversion changes are detected Henrik Grubbström (Grubba)
2010-06-02  4:40 ` [PATCH v4 0/5] Patches to avoid reporting conversion changes Junio C Hamano
2010-06-03 16:00   ` Henrik Grubbström
2010-06-04  0:56     ` Jonathan Nieder
2010-06-04 11:59       ` Henrik Grubbström
2010-06-04 19:42         ` Jonathan Nieder
2010-06-06 10:50           ` Henrik Grubbström
2010-06-07  8:59             ` Finn Arne Gangstad
2010-06-07 16:37               ` Henrik Grubbström
2010-06-07 19:50                 ` Finn Arne Gangstad [this message]
2010-06-08 15:52                   ` Henrik Grubbström
2010-06-09 14:03                     ` Finn Arne Gangstad
2010-06-09 18:04                       ` Henrik Grubbström
2010-06-10 19:55                         ` Finn Arne Gangstad

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=20100607195013.GA27362@pvv.org \
    --to=finnag@pvv.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=grubba@roxen.com \
    --cc=jrnieder@gmail.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).