Filtering commits after filtering the tree

Filtering commits after filtering the tree

[Ulrich Windl]

Hi guys!


As  I know there are really smart ones around, please don't laugh how I helped myself with this problem:
https://stackoverflow.com/q/70505903/6607497
I'm sure you wouldn't have wasted hours with rebasing interactively...


Feel free to comment either on the list or at SO (comment or improved answer).


Regards,
Urich

Re: Filtering commits after filtering the tree

[Son Luong Ngoc]

Hi Ulrich,

On Thu, Dec 30, 2021 at 12:28 PM Ulrich Windl
<Ulrich.Windl@rz.uni-regensburg.de> wrote:
>
> Hi guys!
>
>
> As  I know there are really smart ones around, please don't laugh how I helped myself with this problem:
> https://stackoverflow.com/q/70505903/6607497
> I'm sure you wouldn't have wasted hours with rebasing interactively...
>
>
> Feel free to comment either on the list or at SO (comment or improved answer).

You probably want to try git-filter-repo (1)
while using `--message-callback` as documented in (2)

>
>
> Regards,
> Urich
>
>

Hope it helps,
Son Luong.

(1) https://github.com/newren/git-filter-repo
(2) https://htmlpreview.github.io/?https://github.com/newren/git-filter-repo/blob/docs/html/git-filter-repo.html#CALLBACKS

Re: [EXT] Re: Filtering commits after filtering the tree

[Ulrich Windl]

On 12/30/21 2:19 PM, Son Luong Ngoc wrote:
> Hi Ulrich,
> 
> On Thu, Dec 30, 2021 at 12:28 PM Ulrich Windl
> <Ulrich.Windl@rz.uni-regensburg.de> wrote:
>>
>> Hi guys!
>>
>>
>> As  I know there are really smart ones around, please don't laugh how I helped myself with this problem:
>> https://stackoverflow.com/q/70505903/6607497
>> I'm sure you wouldn't have wasted hours with rebasing interactively...
>>
>>
>> Feel free to comment either on the list or at SO (comment or improved answer).
> 
> You probably want to try git-filter-repo (1)
> while using `--message-callback` as documented in (2)

Interestingly in SLES12 SP5 there is a message recommending 
git-filter-repo, but when I had tried "man git-filter-repo" there was no 
manual page. So I did not follow that path...

> 
>>
>>
>> Regards,
>> Urich
>>
>>
> 
> Hope it helps,
> Son Luong.
> 
> (1) https://github.com/newren/git-filter-repo
> (2) https://htmlpreview.github.io/?https://github.com/newren/git-filter-repo/blob/docs/html/git-filter-repo.html#CALLBACKS
> 

Re: Filtering commits after filtering the tree

[Elijah Newren]

On Fri, Dec 31, 2021 at 2:27 AM Son Luong Ngoc <sluongng@gmail.com> wrote:
>
> Hi Ulrich,
>
> On Thu, Dec 30, 2021 at 12:28 PM Ulrich Windl
> <Ulrich.Windl@rz.uni-regensburg.de> wrote:
> >
> > Hi guys!
> >
> >
> > As  I know there are really smart ones around, please don't laugh how I helped myself with this problem:
> > https://stackoverflow.com/q/70505903/6607497
> > I'm sure you wouldn't have wasted hours with rebasing interactively...
> >
> >
> > Feel free to comment either on the list or at SO (comment or improved answer).
>
> You probably want to try git-filter-repo (1)
> while using `--message-callback` as documented in (2)

In particular, you'd get most of the way there with a simple

   git filter-repo --path my-module/

That will remove all files not under my-module/ from the repository,
AND remove all commits that become empty due to removing all the other
files.


If you had commits which both touched my-module/ and also made
reference to other files outside of my-module/, then you may also want
to clean those up.  If that's something you can write code to do
(perhaps because the commit messages were regular, or you are an
expert at parsing and rewriting natural language programatically),
then the --message-callback suggested by Son could help you out.  That
sounds difficult to me, because I don't know how to even identify such
commits without having a human being read every single one.

But it sounded to me like most of the commit messages you didn't want
were ones that just touched paths outside of your selected module, in
which case the simple path filtering I suggested above would clear
those all out for you.

Antw: [EXT] Re: Filtering commits after filtering the tree

[Ulrich Windl]

>>> Elijah Newren <newren@gmail.com> schrieb am 01.01.2022 um 00:48 in Nachricht
<CABPp-BHnpKZ8LJzd_NL_6TGe7U3A2xPDPuvBkDQ68iTH_un6=A@mail.gmail.com>:
> On Fri, Dec 31, 2021 at 2:27 AM Son Luong Ngoc <sluongng@gmail.com> wrote:
>>
>> Hi Ulrich,
>>
>> On Thu, Dec 30, 2021 at 12:28 PM Ulrich Windl
>> <Ulrich.Windl@rz.uni-regensburg.de> wrote:
>> >
>> > Hi guys!
>> >
>> >
>> > As  I know there are really smart ones around, please don't laugh how I 
> helped myself with this problem:
>> > https://stackoverflow.com/q/70505903/6607497 
>> > I'm sure you wouldn't have wasted hours with rebasing interactively...
>> >
>> >
>> > Feel free to comment either on the list or at SO (comment or improved 
> answer).
>>
>> You probably want to try git-filter-repo (1)
>> while using `--message-callback` as documented in (2)
> 
> In particular, you'd get most of the way there with a simple
> 
>    git filter-repo --path my-module/
> 
> That will remove all files not under my-module/ from the repository,
> AND remove all commits that become empty due to removing all the other
> files.
> 
> 
> If you had commits which both touched my-module/ and also made
> reference to other files outside of my-module/, then you may also want
> to clean those up.  If that's something you can write code to do
> (perhaps because the commit messages were regular, or you are an
> expert at parsing and rewriting natural language programatically),
> then the --message-callback suggested by Son could help you out.  That
> sounds difficult to me, because I don't know how to even identify such
> commits without having a human being read every single one.
> 
> But it sounded to me like most of the commit messages you didn't want
> were ones that just touched paths outside of your selected module, in
> which case the simple path filtering I suggested above would clear
> those all out for you.

Yes, as I had a changelog type of file I had many commits describing changes in changelog that refer to files that are no longer part of the repository (commits for the files themselves had vanished already).
(I know changelogs are a bad idea)

I'll try your proposal next time. Writing custom Python filters is too much for me at the moment...

Thanks and kind Regards (and a happy new year),
Ulrich