From: Zygo Blaxell Date: Sun, 1 Mar 2015 05:02:55 +0000 (-0500) Subject: zygo: pick-kernel: consolidate good/bad lists X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=491d6dba417b2d6c2003c6c7b2c426c5741f7ec5;p=linux zygo: pick-kernel: consolidate good/bad lists --- diff --git a/zygo/pick-kernel b/zygo/pick-kernel index 6803d893c9f9..6779711e0444 100755 --- a/zygo/pick-kernel +++ b/zygo/pick-kernel @@ -9,23 +9,16 @@ 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 + echo -n '++++ ' >&9 else git cherry-pick --abort - git log --oneline --no-walk "$x" >> PICK-BAD + echo -n '---- ' >&9 fi -done + git log --oneline --no-walk "$x" >&9 +done 9> PICK-LIST git merge -s ours "$x" -m"zygo: cherry-picked up to $x (extra args $*) -All commits: +Commits included: -$(git log --oneline --date-order --reverse --no-walk $hashes) - -Included: - -$(cat PICK-GOOD) - -Excluded: - -$(cat PICK-BAD)" +$(cat PICK-LIST)"