From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "G. Sylvie Davies" <sylvie@bit-booster.com>
Cc: Git Users <git@vger.kernel.org>
Subject: Re: not uptodate. Cannot merge
Date: Fri, 5 May 2017 17:12:39 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1.1705051708311.146734@virtualbox> (raw)
In-Reply-To: <CAAj3zPzHiwgS=2CSKP1y8zGUxHUWiq9TSeMhixeL+9ZfffY-pw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1791 bytes --]
Hi Sylvie,
On Thu, 4 May 2017, G. Sylvie Davies wrote:
> My situation: Git-2.10.2.windows.1 / Bitbucket-4.14.3 / Windows
> 10-10.0-amd64. But I suspect even more recent Git will have the same
> problem.
In contrast, I suspect that recent Git for Windows versions have tons of
CR/LF-related fixes... ;-)
> Right after cloning I create a ".git/info/attributes" file containing
> just this one line:
>
> * -text
>
>
> After the clone, here's the sequence of commands leading up to the bad
> "git reset --hard". These are all fine (well, the "--aborts" whine a
> little, but that's expected):
>
> git.exe branch --unset-upstream
> git.exe update-index --refresh
> git.exe rebase --abort
> git.exe cherry-pick --abort
>
>
> And here's the "git reset --hard" that fails:
>
> git.exe reset --hard --quiet d6edcbf924697ab811a867421dab60d954ccad99 --
>
> ---
> Exit=128
> error: Entry 'basic_branching/file.txt' not uptodate. Cannot merge.
> fatal: Could not reset index file to revision
> 'd6edcbf924697ab811a867421dab60d954ccad99'.
> ---
This smells very much like a problem I vaguely remember has been addressed
recently: Torsten Bögershausen was working on issues where files checked
out with one line ending, and then "retroactively" become dirty by
changing the line ending convention (which your -text seems to do) and Git
not really noticing this until the `reset --hard` call that simply cannot
cope with "this kind of dirty".
In essence, I am fairly certain that v2.12.2(2) should *not* display this
behavior.
If my hunch is wrong, please do fill out a full bug report at
https://github.com/git-for-windows/git/issues/new, preferably with a short
and sweet script to reproduce the problem elsewhere.
Thanks,
Johannes
next prev parent reply other threads:[~2017-05-05 15:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-04 21:40 not uptodate. Cannot merge G. Sylvie Davies
2017-05-05 15:12 ` Johannes Schindelin [this message]
2017-05-05 15:25 ` Torsten Bögershausen
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=alpine.DEB.2.21.1.1705051708311.146734@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sylvie@bit-booster.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.
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).