git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: Jeff King <peff@peff.net>,
	Dmitriy Smirnov <dmitriy.smirnov@jetbrains.com>
Cc: git@vger.kernel.org,
	Kirill Likhodedov <kirill.likhodedov@jetbrains.com>,
	Aleksey Pivovarov <aleksey.pivovarov@jetbrains.com>
Subject: Re: git add —ignore-errors causes --renormalize
Date: Sat, 19 Jan 2019 18:08:11 +0100	[thread overview]
Message-ID: <7fb24fe7-4d14-a2ba-f8b6-94c88cb0ecde@web.de> (raw)
In-Reply-To: <20190117162711.GA7935@sigill.intra.peff.net>

On 17.01.19 17:27, Jeff King wrote:
> On Thu, Jan 17, 2019 at 06:22:05PM +0300, Dmitriy Smirnov wrote:
>
>> Calling `git add —ignore-errors` appears to be equal to calling `git add —renormalize`:
>>
>> Main.java is saved with CRLF in repo
>> git config core.autocrlf = input
>>
>> $ src  git:(master) echo line >> Main.java
>> $ src  git:(master) git add --ignore-errors Main.java
>> $ src  git:(master) git commit -m "Ignore errors"
>> [master cf24b3b] Ignore errors
>>  1 file changed, 13 insertions(+), 12 deletions(-)
>>
>>
>> The reason appears to be wrong bit mask usage
>>
>> #define ADD_CACHE_IGNORE_ERRORS    4
>> and
>> #define HASH_RENORMALIZE  4
>>
>> Looks like a regression since 2.16.0 - 9472935d81eaf9faed771878c9df0216ae0d9045
>
> Thanks for a very clear report! The patch below should fix it.

...

Thanks for cleaning up my mess



  parent reply	other threads:[~2019-01-19 17:08 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-17 15:22 git add —ignore-errors causes --renormalize Dmitriy Smirnov
2019-01-17 16:27 ` Jeff King
2019-01-17 16:45   ` Jeff King
2019-01-19 17:08   ` Torsten Bögershausen [this message]
2019-01-29 21:35   ` SZEDER Gábor
2019-01-29 22:51     ` Jeff King

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=7fb24fe7-4d14-a2ba-f8b6-94c88cb0ecde@web.de \
    --to=tboegi@web.de \
    --cc=aleksey.pivovarov@jetbrains.com \
    --cc=dmitriy.smirnov@jetbrains.com \
    --cc=git@vger.kernel.org \
    --cc=kirill.likhodedov@jetbrains.com \
    --cc=peff@peff.net \
    /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).