]> git.hungrycats.org Git - linux/commitdiff
zygo: pick-kernel: consolidate good/bad lists
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Sun, 1 Mar 2015 05:02:55 +0000 (00:02 -0500)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Sun, 1 Mar 2015 05:06:21 +0000 (00:06 -0500)
(cherry picked from commit 491d6dba417b2d6c2003c6c7b2c426c5741f7ec5)

zygo/pick-kernel

index 7c73d966c148d53e998e97ed7ea6e0c5483a6ac0..fd1f8a0e0752cd2ba80d250e583b9002f0367f82 100755 (executable)
@@ -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)"