From: Michael J Gruber <git@drmicha•warpmail.net>
To: Marc Strapetz <marc.strapetz@syntevo•com>
Cc: git@vger•kernel.org
Subject: Re: Applying .gitattributes text/eol changes
Date: Thu, 13 Jan 2011 15:37:46 +0100 [thread overview]
Message-ID: <4D2F0E3A.8090108@drmicha.warpmail.net> (raw)
In-Reply-To: <4D2F0BF3.2000808@syntevo.com>
Marc Strapetz venit, vidit, dixit 13.01.2011 15:28:
>>> case of missing .git/index, Git freshly writes all working tree files,
>>> ignoring already existing files which already have the correct content.
>>> Maybe this behavior is by intention and makes sense in some cases. In my
>>> case it has adverse effects on IDEs and probably other tools which are
>>> monitoring the file system.
>>
>> ...but changing gitattributes is something you don't do routinely in
>> your workflow; so, at worst there would be an occasional unnecessary run
>> of your build process.
>
> Our Git-SVN bridge does it, potentially on every pull. This is why we
> currently need to run "rm .git/index && git reset --hard" after every
> pull, resp. every checkout (switching to another commit may result in
> changed .gitattributes as well).
OK, now you're telling us what this is about ;)
> If a "git checkout" would (optionally) make sure that all EOLs are
> properly set according to .gitattributes, the problem would be resolved.
> As this might be not so easy to implement, my suggestion was to make
> "git reset --hard" work more unobtrusive. I think we can provide a
> corresponding patch, if it has chances to get accepted.
There have been other cases where git update-index --really-refresh
wasn't enough. You might want to check whether that is a suitable "patch
attack vector". This might be useful not only for you but also for others.
Michael
next prev parent reply other threads:[~2011-01-13 14:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-03 17:18 Applying .gitattributes text/eol changes Marc Strapetz
2011-01-11 9:29 ` Marc Strapetz
2011-01-11 12:11 ` Michael J Gruber
2011-01-11 14:02 ` Marc Strapetz
2011-01-13 13:23 ` Michael J Gruber
2011-01-13 14:28 ` Marc Strapetz
2011-01-13 14:37 ` Michael J Gruber [this message]
2011-01-13 14:57 ` Marc Strapetz
2011-01-13 23:30 ` Junio C Hamano
2011-01-14 8:31 ` Michael J Gruber
2011-01-14 9:05 ` Marc Strapetz
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=4D2F0E3A.8090108@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
--cc=marc.strapetz@syntevo$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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