]> git.hungrycats.org Git - linux/commitdiff
zygo: first revision of pick-kernel
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Wed, 11 Feb 2015 17:47:12 +0000 (12:47 -0500)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Wed, 11 Feb 2015 17:47:12 +0000 (12:47 -0500)
zygo/pick-kernel [new file with mode: 0755]

diff --git a/zygo/pick-kernel b/zygo/pick-kernel
new file mode 100755 (executable)
index 0000000..7c73d96
--- /dev/null
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -x
+git clean -dfx
+git stash
+git cherry-pick --quit
+
+hashes="$(git log --date-order ^HEAD --no-merges --format=%h --reverse "$@")"
+
+for x in $hashes; do
+       if git cherry-pick -x "$x"; then
+               git log --oneline --no-walk "$x" >> PICK-GOOD
+       else
+               git cherry-pick --abort
+               git log --oneline --no-walk "$x" >> PICK-BAD
+       fi
+done
+
+git merge -s ours "$x" -m"zygo: cherry-picked up to $x (extra args $@)
+
+All commits:
+
+$(git log --oneline --date-order --reverse --no-walk $hashes)
+
+Included:
+
+$(cat PICK-GOOD)
+
+Excluded:
+
+$(cat PICK-BAD)"