index : checker | |
Archlinux32 consistency checker | gitolite user |
summaryrefslogtreecommitdiff |
author | Andreas Baumann <mail@andreasbaumann.cc> | 2025-04-03 07:25:13 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2025-04-03 07:25:13 +0200 |
commit | 9557b6ced97a26959ccb19de2b0bf248740df306 (patch) | |
tree | 87f7aee9ad272f3cf209d2ef57cc8d95918f5f5a | |
parent | 58480403d9b74ac5f84108a24544d4e3506fbf35 (diff) |
-rw-r--r-- | templates/summary.m4 | 6 |
diff --git a/templates/summary.m4 b/templates/summary.m4 index c39f6c6..c8cf5ed 100644 --- a/templates/summary.m4 +++ b/templates/summary.m4 @@ -52,7 +52,7 @@ _SECTION_HEADER(h3,_DROPPING_TO_AUR_PREEXISTING_IN_AUR) git clone ssh://aur@aur.archlinux.org/<package> <package> cd <package> attach the upstream gitlab repo of the dropped package -git remote add gitlab https://gitlab.archlinux.org/archlinux/packaging/packages/mp3wrap.git +git remote add gitlab https://gitlab.archlinux.org/archlinux/packaging/packages/<package>.git git fetch gitlab # gitlab uses main as main branch, AUR still master git checkout main @@ -66,6 +66,10 @@ git merge --allow-unrelated-histories main # last pakcage versions, you can also just rebase to the version of main # gitlab git commit -a -m 'merged with gitlab <package> (existed before in the AUR)' +# AUR doesn't like subdirs, rewrite the git history so that they are in the root directory +# also, maybe remove the 'keys' subdir with pgp keys +git filter-repo --path-rename <subdir>/: +git commit -a -m 'rewrote git history removing subdirs' git push origin master </code></pre> |