!rGlCMuXgAhgEpdvJUz:nixos.org

NixOS KDE

206 Members
57 Servers

Load older messages


SenderMessageTime
7 Aug 2025
@k900:0upti.meK900 ⚡️ But then if you say git log pkgs/by-name/ca/calamares-nixos-extensions/src/whatever it gives you nothing 15:51:29
@k900:0upti.meK900 ⚡️But just the merge15:51:31
@k900:0upti.meK900 ⚡️ Because before the merge it exists at /whatever 15:52:05
@emilazy:matrix.orgemily git log --follow 15:52:15
@k900:0upti.meK900 ⚡️Doesn't work15:52:21
@k900:0upti.meK900 ⚡️It isn't considered a rename15:52:26
@k900:0upti.meK900 ⚡️git is extremely stupid about this15:52:38
@emilazy:matrix.orgemilyhuh? it definitely should be considered a rename considering rename detection is entirely heuristics15:53:03
@k900:0upti.meK900 ⚡️I wish I could tell you15:53:19
@emilazy:matrix.orgemilylet me try it15:53:32
@k900:0upti.meK900 ⚡️Oh, it also fails to rebase randomly if someone touches flake.nix or .editorconfig or whatever at nixpkgs root15:53:42
@k900:0upti.meK900 ⚡️Because as far as the old history is concerned THAT'S THE THING15:53:57
@emilazy:matrix.orgemilywell it's just a one-time merge and we shouldn't be using the normal Git merge algo for it anyway (that's what subtree merges are for in the first place)15:54:20
@emilazy:matrix.orgemilybut let me see if I can reproduce15:54:22
@emilazy:matrix.orgemilyI'm pretty nak on rewriting the entire history unless we absolutely have to15:54:34
@k900:0upti.meK900 ⚡️Honestly I'm very tempted to just yeet the history at this point especially since like 90% of it is garbage15:54:40
@k900:0upti.meK900 ⚡️...oh no15:55:20
@k900:0upti.meK900 ⚡️OH NO.15:55:22
@emilazy:matrix.orgemily I will be super unhappy if you break my blame 15:55:23
@k900:0upti.meK900 ⚡️We have a problem15:55:31
@k900:0upti.meK900 ⚡️There's actual Calamares source code in that history15:56:17
@k900:0upti.meK900 ⚡️Which is very much GPL15:56:24
@k900:0upti.meK900 ⚡️And we are not relicensing it15:56:27
@k900:0upti.meK900 ⚡️But we probably don't actually want it to be in our history15:56:38
@k900:0upti.meK900 ⚡️For obvious reasons15:56:40
@emilazy:matrix.orgemilyI don't see why15:56:52
@emilazy:matrix.orgemilythe files are tagged appropriately at the relevant point in the history15:56:56
@k900:0upti.meK900 ⚡️But also like that history is objectively garbage15:57:32
@k900:0upti.meK900 ⚡️Because none of that code matters15:57:35
@k900:0upti.meK900 ⚡️And it's only there because vlinkz had no idea how to calamares15:57:44

Show newer messages


Back to Room ListRoom Version: 9