Med Java

This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
====== Move files to another git repo and preserve history ======

<note>
git filter-branch is a mess, use python3 git-filter-repo instead to filter the commits to be saved to the new repo.
</note>

Steps used:

1) Create a new local branch of the source repo (A) and switch to it (branchOnRepoA).

2) Filter the directories that you want to keep from A using git-filter-repo. This will rewrite history.
It should de downloaded first from https://github.com/newren/git-filter-repo

<code>
python3 git-filter-repo --force --path src/main/resources/folder1 --path src/main/resources/folder2
</code>

3) In destination repo (B) we should add A as a remote source repo

<code>
git remote add source C:\repoA
</code>

source - remote repo name
C:\repoA - path to the remote source repo

4) From B import data from A:

<code>
git fetch source
</code>

5) From B, merge A branch:

<code>
git merge source/branchOnRepoA --allow-unrelated-histories
</code>

6) From B, remove A:

<code>
git remote remove source
</code>

7) From B, push changes:

<code>
git push "origin" main:main
</code>

<note>If git repo is hosted in gitlab and you receive the error: "You can only push commits if the committer email is one of your own verified emails.", check repo settings in gitlab and uncheck the following checkbox: {{:git:pasted:20231124-123408.png}}</note>

8) Clean-up local branch created in step 1).