]> git.hungrycats.org Git - linux/commitdiff
zygo: remove obsolete (and a little bit dangerous) cherry-pick scripts
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Thu, 30 Jan 2020 17:54:34 +0000 (12:54 -0500)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Thu, 30 Jan 2020 18:02:09 +0000 (13:02 -0500)
(cherry picked from commit 3ec46e9b8830f60617d195b04c0df35890820dd5)

zygo/pick-kernel [deleted file]
zygo/pick-kernel-btrfs [deleted file]

diff --git a/zygo/pick-kernel b/zygo/pick-kernel
deleted file mode 100755 (executable)
index 0fee5a9..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-set -x
-
-git clean -qdfx
-git stash
-git cherry-pick --quit
-
-hashes="$(git log --date-order ^HEAD --no-merges --format=%h --reverse "$@" | tr '\n' ' ')"
-tips="$(  git log --date-order ^HEAD --no-merges --format=%h --no-walk "$@" | tr '\n' ' ')"
-
-pickList=''
-
-for x in $hashes; do
-       if git cherry-pick -x "$x"; then
-               prefixString='++++'
-       else
-               git cherry-pick --abort
-               prefixString='----'
-       fi
-       pickList="$pickList
-$prefixString $(git log --oneline --no-walk "$x")"
-done
-
-if [ -n "$pickList" ]; then
-       git merge -s ours $hashes -m"zygo: cherry-picked up to $*
-
-Commits included (++++) and excluded (----):
-$pickList"
-fi
diff --git a/zygo/pick-kernel-btrfs b/zygo/pick-kernel-btrfs
deleted file mode 100755 (executable)
index 9f5a566..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -x
-set -a
-ORIG_PATH="$PATH"
-PATH="$PWD/zygo:$ORIG_PATH"
-
-git remote update
-
-# Mine unmerged btrfs commits from upstreams
-# ...but don't pick up the ancient ones from 2009
-pick-kernel \
-       linus/master \
-       --remotes=btrfs-next/\* \
-       --remotes=mason/\* \
-       --after='now - 90 days' \
-       -- \
-       fs/btrfs \
-
-KCONFIG_NOTIMESTAMP=1 make oldconfig prepare modules_prepare -j
-make SUBDIRS=fs/btrfs -j
-date