git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Josef Wolf <jw@raven.inka.de>
To: git@vger.kernel.org
Subject: renormalize histroy with smudge/clean-filter
Date: Wed, 5 Feb 2025 22:47:26 +0100	[thread overview]
Message-ID: <20250205214726.GA30202@raven.inka.de> (raw)

Hello all,

I have set up clean/smudge filters to normalzize files from an application to
reduce the pain when those files are tracked by git.

The clean/smudge filter work well on new commit and the result of
smudge+smudge+clean is the same as the result of a simple clean, so the filter
should be fine IMHO.

But whenever I do any operations which introduce not yet normalized commits, I
keep getting errors.

So to get rod of those errors, I'd like to also renormalize the history:

  $ git rebase --root --strategy renormalize
  error: Your local changes to the following files would be overwritten by
  merge:
        foo/bar/baz
  Please commit your changes or stash them before you merge.
  Aborting
  $ git add foo/bar/baz
  $ git commit -m renormalize foo/bar/baz
  $ git rebase --continue
  git: 'merge-renormalize' is not a git command. See 'git --help'.
  error: could not apply abcdef... Foo Bar Baz
  [ ... ]

Huh? I never entered a command "merge-renormalize"

BTW: It does not make any difference whether I add "-c merge.renormalze=true"

What would be the proper way to renormalize history?

Any help?

-- 
Josef Wolf
jw@raven.inka.de

             reply	other threads:[~2025-02-05 21:48 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-05 21:47 Josef Wolf [this message]
2025-02-05 22:55 ` renormalize histroy with smudge/clean-filter brian m. carlson
2025-02-05 23:59   ` Josef Wolf
2025-02-06  0:29     ` brian m. carlson
2025-02-06  8:07       ` Elijah Newren
2025-02-06 13:40         ` Josef Wolf
2025-02-06 20:04           ` Josef Wolf
2025-02-07  6:10             ` Chris Torek
2025-02-07 10:45               ` Josef Wolf
2025-02-07 11:06                 ` Torsten Bögershausen
2025-02-07 11:12                 ` Chris Torek
2025-02-07 11:17                   ` Chris Torek
2025-02-07 14:01                   ` Elijah Newren
2025-02-07 20:32                     ` Josef Wolf
2025-02-08  0:23                       ` Elijah Newren
2025-02-08 11:14                         ` Phillip Wood
2025-02-08 21:08                           ` Josef Wolf
2025-02-08 21:43                           ` Elijah Newren
2025-02-08 23:26                             ` Josef Wolf
2025-02-09  2:33                               ` D. Ben Knoble
2025-02-09  8:53                                 ` Josef Wolf
2025-02-09  7:21                               ` Elijah Newren
2025-02-09  8:57                                 ` Josef Wolf
2025-02-10 17:51                                   ` D. Ben Knoble
2025-02-08 20:57                         ` Josef Wolf
2025-02-08 21:56                           ` Elijah Newren
2025-02-09  9:25                           ` Josef Wolf
2025-02-09 11:14                             ` Torsten Bögershausen
2025-02-09 15:09                               ` Josef Wolf
2025-02-09 17:54                                 ` Josef Wolf
2025-02-09 18:01                                   ` Josef Wolf
2025-02-07 20:21                   ` Josef Wolf
2025-02-07 15:39                 ` Junio C Hamano
2025-02-06 10:13     ` Phillip Wood
2025-02-06  7:55   ` Elijah Newren
2025-02-06 19:00     ` Junio C Hamano
2025-02-11 23:57 ` renormalize histroy with smudge/clean-filter, again Josef Wolf
2025-02-12  6:12   ` Torsten Bögershausen
2025-02-12  8:18     ` Josef Wolf
2025-02-13 11:36   ` Collisions while cloning (was: Re: renormalize histroy with smudge/clean-filter, again) Josef Wolf
2025-02-13 16:40     ` Torsten Bögershausen
2025-02-14 20:03   ` renormalize histroy with smudge/clean-filter, again Josef Wolf
2025-02-14 20:21   ` brian m. carlson
2025-02-14 20:55     ` Josef Wolf

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=20250205214726.GA30202@raven.inka.de \
    --to=jw@raven.inka.de \
    --cc=git@vger.kernel.org \
    /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).