mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-18 12:54:39 +00:00
3561015efd
For years, we have struggled and been frustrated at loosing history of files in git, due to the 'copy + add' strategy. This could have been prevented with a double-commit 'mv + add' trick. On the mailing list [0] the discussion was started to put the instructions in a wiki. Instead, it is much better to just script it and put it in the repo. Instead of doing mv + copy, which leads to two commits, but no history on the copied files, it uses move, + copy and merge, which results in three (merge) commits, but keeps the history of all files. As always with renames, `--follow` will be needed. The tool is trivial and works either in the OpenWrt git root directory, or in the actual target directory. Tested on the `realtek` and generic targets. Note, that the tool does not do any of the labor needed after the move, such as updating configs, dropping patches etc. To make sure this script is easily found by any developer, who just wants to do a kernel bump, the script is added here and not to maintainer-tools repo as those scripts are a little bit more specialized. Bumping a kernel is a trivial task that often regular developers do, where most do not even know the existence of maintainer tools, are not part of the main repo they'd clone, not part of the docker container they'd use and so discoverability is probably much more important. [0]: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Tested-by: Robert Marko <robimarko@gmail.com> Tested-by: Weijie Gao <hackpascal@gmail.com> |
||
|---|---|---|
| .. | ||
| config | ||
| flashing | ||
| brcmImage.pl | ||
| bundle-libraries.sh | ||
| cameo-imghdr.py | ||
| cameo-tag.py | ||
| cfe-bin-header.py | ||
| cfe-partition-tag.py | ||
| cfe-wfi-tag.py | ||
| check-toolchain-clean.sh | ||
| checkpatch.pl | ||
| clean-package.sh | ||
| cleanfile | ||
| cleanpatch | ||
| combined-ext-image.sh | ||
| combined-image.sh | ||
| command_all.sh | ||
| config.guess | ||
| config.rpath | ||
| config.sub | ||
| const_structs.checkpatch | ||
| deptest.sh | ||
| diffconfig.sh | ||
| dl_cleanup.py | ||
| dl_github_archive.py | ||
| download.pl | ||
| dump-target-info.pl | ||
| env | ||
| ext-toolchain.sh | ||
| ext-tools.sh | ||
| feeds | ||
| fixup-makefile.pl | ||
| functions.sh | ||
| gen_image_generic.sh | ||
| gen-dependencies.sh | ||
| get_source_date_epoch.sh | ||
| getver.sh | ||
| ipkg-build | ||
| ipkg-make-index.sh | ||
| ipkg-remove | ||
| json_add_image_info.py | ||
| json_overview_image_info.py | ||
| kconfig.pl | ||
| kernel_bump.sh | ||
| make-ipkg-dir.sh | ||
| md5sum | ||
| metadata.pm | ||
| mkhash.c | ||
| mkits-qsdk-ipq-image.sh | ||
| mkits-zyxel-fit-filogic.sh | ||
| mkits-zyxel-fit.sh | ||
| mkits.sh | ||
| moxa-encode-fw.py | ||
| netgear-encrypted-factory.py | ||
| noop.sh | ||
| om-fwupgradecfg-gen.sh | ||
| package-metadata.pl | ||
| pad_image | ||
| patch-kernel.sh | ||
| patch-specs.sh | ||
| portable_date.sh | ||
| qemustart | ||
| redboot-script.pl | ||
| relink-lib.sh | ||
| remote-gdb | ||
| rstrip.sh | ||
| sercomm-crypto.py | ||
| sercomm-kernel-header.py | ||
| sercomm-partition-tag.py | ||
| sercomm-payload.py | ||
| sercomm-pid.py | ||
| sign_images.sh | ||
| size_compare.sh | ||
| slugimage.pl | ||
| spelling.txt | ||
| srecimage.pl | ||
| strip-kmod.sh | ||
| symlink-tree.sh | ||
| sysupgrade-tar.sh | ||
| target-metadata.pl | ||
| time.pl | ||
| timestamp.pl | ||
| ubinize-image.sh | ||
| xxdi.pl | ||