A Method of Breaking Git

[Bjørn Mork]

Christian Marangi <ansuelsmth at gmail.com> writes:

> Anyway I have also found this [1]... if it does actually works, it might be
> THE solution to our specific problem. Wonder if someone can test it on a
> sample repository.
>
> [1] https://devblogs.microsoft.com/oldnewthing/20190919-00/?p=102904

Nice!  Seems to work.  Tried this in an almost uptodate OpenWrt main
branch:

   git checkout -b dup
   git mv target/linux/ramips/mt7621/config-5.15 target/linux/ramips/mt7621/config-6.1
   git commit -s -m 'create config-6.1 based on config-5.15'
   git checkout HEAD~  target/linux/ramips/mt7621/config-5.15
   git commit -s -m 'restore config-5.15'
   git checkout -
   git merge --no-ff dup

and ended up with

 bjorn at canardo:/usr/local/src/openwrt$ git log --oneline --follow -n 5 target/linux/ramips/mt7621/config-5.15
 6e91f43c99a7 (dup) restore config-5.15
 5a742b351365 create config-6.1 based on config-5.15
 cd2b74e01e8d ramips: mt7621: disable highmem support and remove highmem offset patch
 39b2251cd972 treewide: remove CONFIG_FRAME_WARN from kernel configs
 dc38199b96ee ramips/mt7621: disable the cpufreq driver

 bjorn at canardo:/usr/local/src/openwrt$ git log --oneline --follow -n 5 target/linux/ramips/mt7621/config-6.1 
 5a742b351365 create config-6.1 based on config-5.15
 cd2b74e01e8d ramips: mt7621: disable highmem support and remove highmem offset patch
 39b2251cd972 treewide: remove CONFIG_FRAME_WARN from kernel configs
 dc38199b96ee ramips/mt7621: disable the cpufreq driver
 958fdf36e35c generic: mt7530: backport support for the MT7988 built-in switch


Best solution so far



Bjørn