Re: [bug] lots of changes including .gitignore, many rebases, can't legally share the repo

From: Torsten Bögershausen <tboegi@web.de>
Date: Jul 21, 2023, 06:58 UTC
Message-ID: <20230721065833.q2zshssu4clbzxq6@tb-raspi4>
In-Reply-To: <CAH3jj7fS3wziLfnAfKz49W+aZVPvF8Nm9UVBMWyeHLvYov7A-w@mail.gmail.com>

On Fri, Jul 21, 2023 at 12:52:30AM +0300, Radu Dan wrote:

Show 20 quoted lines

> Thank you for filling out a Git bug report!
> Please answer the following questions to help us understand your issue.
>
> > What did you do before the bug happened? (Steps to reproduce your issue)
>
> % git stash
> No local changes to save
>
> % git commit -m wtf
> On branch test
> Your branch is up to date with 'origin/test'.
>
> nothing to commit, working tree clean
>
> % git checkout main
> error: Your local changes to the following files would be overwritten
> by checkout:
> settings/local.py
> Please commit your changes or stash them before you switch branches.
> Aborting

First of all: thanks for your feedback. However, the situation on your local disk is hard to debug from remote. Which could be frustrating on both sides, so to say.

So we may come further by asking some questions:
- Is the repo you are talking about public ?
Does settings/local.py exist is both branches, origin/test and main ?
- What does
  git ls-files --eol setings/local.py
  give you ?

- Is there a .gitignore, which is different on both branches ?
- What does
  git ls-files | grep -i local.py
  give you ?

Show 12 quoted lines

>
> > What did you expect to happen? (Expected behavior)
>
> Switch to `main`
>
> > What happened instead? (Actual behavior)
>
> Still on current branch
>
> > What's different between what you expected and what actually happened?
>
> Better error message

The error message as such is probably the best information that Git has, the question is, which changes does Git see ?

Another question : what does git add --renormalize . give you ? (Please do not omit the '.')

Show 25 quoted lines

>
> > Anything else you want to add:
>
> First bug in 10 years of usage, great work!
>
> > Please review the rest of the bug report below.
> > You can delete any lines you don't wish to share.
>
> [System Info]
> git version:
> git version 2.39.2 (Apple Git-143)
> cpu: x86_64
> no commit associated with this build
> sizeof-long: 8
> sizeof-size_t: 8
> shell-path: /bin/sh
> feature: fsmonitor--daemon
> uname: Darwin 22.5.0 Darwin Kernel Version 22.5.0: Thu Jun  8 22:22:22
> PDT 2023; root:xnu-8796.121.3~7/RELEASE_X86_64 x86_64
> compiler info: clang: 14.0.3 (clang-1403.0.22.14.1)
> libc info: no libc information available
> $SHELL (typically, interactive shell): /bin/zsh
>
>
> [Enabled Hooks]