From 3801d72e51a1c72dd10bac6c715b532ed8e17a4d Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@denkbrett.schottelius.org>
Date: Mon, 4 Aug 2008 16:26:19 +0200
Subject: [PATCH] update cherry to use git-log

Signed-off-by: Nico Schottelius <nico@denkbrett.schottelius.org>
---
 linux/cherry-branches.sh | 15 +++++++--------
 linux/init-branches.sh   |  0
 linux/merge-branches.sh  |  0
 3 files changed, 7 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 linux/init-branches.sh
 mode change 100644 => 100755 linux/merge-branches.sh

diff --git a/linux/cherry-branches.sh b/linux/cherry-branches.sh
index b748ccb..1500645 100755
--- a/linux/cherry-branches.sh
+++ b/linux/cherry-branches.sh
@@ -18,12 +18,11 @@
 
 echo "Displaying commits you don't have in your tree"
 
-for remote in $(awk '$2 ~ /git/ { print $1 }' Next/Trees); do
-   url=$(awk "\$1 ~ /$remote/ { print \$3 }" Next/Trees)
-   rurl=$(echo $url | awk -F'#' '{ print $1 }')
-   branch=$(echo $url | awk -F'#' '{ print $2 }')
-   
-   cherry="$remote/$branch"
-   echo "Cherry: $cherry ..."
-   git-cherry $cherry | grep -v '^+ '
+for remote in $(git-branch -r); do
+   #echo "==> Cherry: $remote ..."
+   # is slow
+   # git-cherry $remote | grep -v '^+ '
+
+   # is fast
+   git-log --pretty=oneline --left-right master..$remote | sed "s;^;$remote;"
 done
diff --git a/linux/init-branches.sh b/linux/init-branches.sh
old mode 100644
new mode 100755
diff --git a/linux/merge-branches.sh b/linux/merge-branches.sh
old mode 100644
new mode 100755