Skip to content

rewrite main history to fix LFS issues

Julien Plissonneau Duquène requested to merge (removed):rewrite-main into main

Marked as draft to prevent web UI merge attempts. This branch (commit 2917a839) should be force-pushed to main.

Rewrites the main history to:

  • remove large binary objects that cause CI tests to fail
  • remove uploaded photos that cause LFS issues (missing objects).

git rebase -ir 7ab54d6c9109543960aa7b2ff59bc7dc024b1812 TODO list after editing:

--- xx0	2025-08-13 14:07:57.234423957 +0000
+++ xx5	2025-08-13 13:43:22.975384174 +0000
@@ -2,115 +2,19 @@
 
 # Branch main
 reset 7112fe7 # Merge branch 'main' into 'main'
-pick b0abbd4 Add slide for Cryptography in the Linux Kernel at PQC
+edit b0abbd4 Add slide for Cryptography in the Linux Kernel at PQC
+# manually squash this fixup:
+#fixup c5e4343 Add slide for Cryptography in the Linux Kernel at PQC
 label main
 
-# Branch revert-652c5212
-reset 547db2d # Merge branch 'aigarius-main-patch-fea5' into 'main'
-merge -C 93e4ac3 onto # Merge branch 'photos-sre4ever' into 'main'
-label branch-point-2
-merge -C 652c521 main # Merge branch 'main' into 'main'
-label branch-point
-pick 90cfa38 Revert "Merge branch 'main' into 'main'"
-label revert-652c5212
-
-# Branch revert-93e4ac3a
-reset branch-point # Merge branch 'main' into 'main'
-pick 8c76e17 Revert "Merge branch 'photos-sre4ever' into 'main'"
-label revert-93e4ac3a
-
-# Branch atzlinux-photo
-reset 547db2d # Merge branch 'aigarius-main-patch-fea5' into 'main'
-pick 0b2b968 atzlinux(xiao sheng wen) photo in debconf25
-label atzlinux-photo
-
-# Branch main-2
-reset 7112fe7 # Merge branch 'main' into 'main'
-pick c5e4343 Add slide for Cryptography in the Linux Kernel at PQC
-label main-2
-
-# Branch revert-652c5212-2
-reset branch-point-2 # Merge branch 'photos-sre4ever' into 'main'
-merge -C 4d795cc main-2 # Merge branch 'main' into 'main' # keep
-label branch-point-3
-pick f399f34 Revert "Merge branch 'main' into 'main'"
-label revert-652c5212-2
-
-# Branch revert-93e4ac3a-2
-reset branch-point-3 # Merge branch 'main' into 'main'
-pick b5c5619 Revert "Merge branch 'photos-sre4ever' into 'main'"
-label revert-93e4ac3a-2
-
-# Branch atzlinux-photo-2
-reset 547db2d # Merge branch 'aigarius-main-patch-fea5' into 'main'
-pick a61f395 atzlinux(xiao sheng wen) photo in debconf25
-label atzlinux-photo-2
-
-# Branch main-3
-reset branch-point-3 # Merge branch 'main' into 'main'
-merge -C f7484bd revert-652c5212-2 # Merge branch 'revert-652c5212' into 'main'
-merge -C bf84c61 revert-93e4ac3a-2 # Merge branch 'revert-93e4ac3a' into 'main'
-merge -C ba002e8 atzlinux-photo-2 # Merge branch 'atzlinux-photo' into 'main'
-label main-3
-
-# Branch atzlinux-photo-3
-reset atzlinux-photo-2 # atzlinux(xiao sheng wen) photo in debconf25
-merge -C 243f59f main-3 # Merge branch 'main' into atzlinux-photo
-label atzlinux-photo-3
-
-# Branch atzlinux-photo-4
-reset atzlinux-photo-3 # Merge branch 'main' into atzlinux-photo
-pick d9c5a29 update .gitattributes, remove slides/211-*.pdf line
-label atzlinux-photo-4
-
-# Branch atzlinux-photo-5
-reset atzlinux-photo-4 # update .gitattributes, remove slides/211-*.pdf line
-pick 36cc797 add firework pic
-label atzlinux-photo-5
-
 # Branch atzlinux-photo-6
-reset atzlinux-photo-5 # add firework pic
-pick 24203d5 add .pdf suffix for 172 slide filename
+reset 547db2d # Merge branch 'aigarius-main-patch-fea5' into 'main'
+edit 24203d5 add .pdf suffix for 172 slide filename # also change .gitattributes
 label atzlinux-photo-6
 
-# Branch atzlinux-photo-7
-reset atzlinux-photo-3 # Merge branch 'main' into atzlinux-photo
-pick a4e14cb update .gitattributes, remove slides/211-*.pdf line # empty
-label atzlinux-photo-7
-
-# Branch atzlinux-photo-8
-reset atzlinux-photo-7 # update .gitattributes, remove slides/211-*.pdf line
-pick 5fd7bf6 add firework pic
-label atzlinux-photo-8
-
-# Branch atzlinux-photo-9
-reset atzlinux-photo-8 # add firework pic
-pick 5fd7ac6 add .pdf suffix for 172 slide filename
-label atzlinux-photo-9
-
-# Branch xiao-photos
-reset main-3 # Merge branch 'atzlinux-photo' into 'main'
-merge -C 74fa01e atzlinux-photo-3 # Merge branch 'atzlinux-photo' into 'main'
-merge -C d0f5ea1 atzlinux-photo-7 # Merge branch 'atzlinux-photo' into 'main'
-merge -C 86ce28e atzlinux-photo-8 # Merge branch 'atzlinux-photo' into 'main'
-merge -C 325b961 atzlinux-photo-9 # Merge branch 'atzlinux-photo' into 'main'
-pick 3f4c0bf update .gitattributes, remove slides/172-* line
-label xiao-photos
-
-# Branch xiao-photos-2
-reset xiao-photos # update .gitattributes, remove slides/172-* line
-merge -C 133c085 xiao-photos # Merge branch 'xiao_photos' of salsa.debian.org:debconf-team/public/share/debconf25 into xiao_photos
-label xiao-photos-2
-
-reset branch-point # Merge branch 'main' into 'main'
-merge -C a7a3a4b revert-652c5212 # Merge branch 'revert-652c5212' into 'main'
-merge -C fc9671a revert-93e4ac3a # Merge branch 'revert-93e4ac3a' into 'main'
-merge -C 694d2b2 atzlinux-photo # Merge branch 'atzlinux-photo' into 'main'
-merge -C cb155fb atzlinux-photo-3 # Merge branch 'atzlinux-photo' into 'main'
-merge -C c148591 atzlinux-photo-4 # Merge branch 'atzlinux-photo' into 'main'
-merge -C 49ca654 atzlinux-photo-5 # Merge branch 'atzlinux-photo' into 'main'
+reset 547db2d # Merge branch 'aigarius-main-patch-fea5' into 'main'
+merge -C 652c521 main # Merge branch 'main' into 'main'
 merge -C 924048f atzlinux-photo-6 # Merge branch 'atzlinux-photo' into 'main'
-merge -C ac7b1b5 xiao-photos-2 # Merge branch 'xiao_photos' into 'main'
 
 # Rebase 7ab54d6..ac7b1b5 onto 7ab54d6 (76 commands)
 #
Edited by Julien Plissonneau Duquène

Merge request reports

Loading