Re: renormalize histroy with smudge/clean-filter

From: Torsten Bögershausen <tboegi@web.de>
Date: Feb 7, 2025, 11:06 UTC
Message-ID: <20250207110625.GA28576@tb-raspi4>
In-Reply-To: <20250207104510.GE30202@raven.inka.de>

On Fri, Feb 07, 2025 at 11:45:10AM +0100, Josef Wolf wrote:

> On Thu, Feb 06, 2025 at 10:10:26PM -0800, Chris Torek wrote:
> > [First]
> >
> > > On Thu, Feb 06, 2025 at 02:40:06PM +0100, Josef Wolf wrote:

[]

Show 11 quoted lines

> Ummm... That's far beyond my git expertise...
>
> I completely fail to understand why git insists to operate on smudged files in
> many situations.
>
> IIUC, once clean/smudge are installed, all internal operations should be done
> on clean files. So why do I need this "git add --renormalize ." at all and (in
> the case of cherry-pick) there is not even any way to renormalize before
> picking.
>
> But maybe my understanding is too simplicistic here...

Now, well, there is a lot of history here. Why things work, and what is working. The short version: The '--renormalize' functionality came into Git much later then all other commands, if I simplify things.

There had been different answers here in this thread, and I try to be helpful.

In general, this could work, fully untested:

Take the first commit from your svn import. Check out a branch. Add a proper (!) .gitattributes file. run 'git add --renornormalize .' 'git commit'

Now the fun starts. From what I understand, the following could work:

  foreach $commit original-branch-commits
       git merge  -X renormalize $commit

However, I don't have such a repo to test things.