[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [lmi] Avoiding a git-checkout failure

From: Greg Chicares
Subject: Re: [lmi] Avoiding a git-checkout failure
Date: Tue, 28 Jul 2020 13:59:08 +0000
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0

On 2020-07-28 13:13, Vadim Zeitlin wrote:
> On Tue, 28 Jul 2020 12:51:49 +0000 Greg Chicares <gchicares@sbcglobal.net> 
> wrote:
> GC> [here, PWD is /srv/cache_for_lmi/vcs/wxWidgets]
> GC>   git checkout "$wx_commit_sha"
> GC>   + git checkout 6cdaedd42ba59331b3dc4ead50e0bac76ae14c19
> GC>   error: Your local changes to the following files would be overwritten 
> by checkout:
> GC>         .gitignore
> GC>         .mailmap
> GC>         .travis.yml
> GC>         CMakeLists.txt
> GC>         Makefile.in
> GC>   Please move or remove them before you switch branches.
> GC>   Aborting
>  This looks like a problem with permissions, due to either Git version
> change or Git options change in ~/.gitconfig, i.e. maybe this checkout
> predates the addition of "git config --global core.filemode true" to
> install_msw.sh? I.e. I strongly suspect that if you run "git diff" in this
> directory, you will see that the only changes are in the file mode.

We've already run 'git reset --hard' in that directory, so
unfortunately we can no longer test any hypotheses.

What we do know is that the files were copied with msw
'explorer' and not with cygwin, so it's not unlikely that
permissions were damaged.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]