From: Junio C Hamano <junkio@cox.net>
Date: Thu, 4 May 2006 23:01:16 +0000 (-0700)
Subject: Snapshot 2006-05-04
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0bc1bdd1ec394705a13ec726bd25ad5390746277;p=git.git

Snapshot 2006-05-04
---

diff --git a/Doit b/Doit
index 8a947d2f..e10e32e2 100755
--- a/Doit
+++ b/Doit
@@ -8,7 +8,7 @@ test -z "$(git diff --cached --name-status)" || {
 }
 Meta/Make clean >/dev/null 2>&1
 
-: ${branches='next master pu'}
+: ${branches='next master maint pu'}
 
 nstall=install
 for branch in $branches
@@ -20,8 +20,7 @@ do
 		Meta/Make $J all &&
 		Meta/Make $J $nstall &&
 		Meta/Make test &&
-		Meta/Make clean &&
-		nstall=all || exit $?
+		Meta/Make clean || exit $?
 	else
 		echo "* No $branch"
 	fi
diff --git a/RB b/RB
index ebd5efea..918a3727 100755
--- a/RB
+++ b/RB
@@ -9,6 +9,12 @@ sed -n \
     -e '/^[^\/][^\/]\//p' |
 while read topic
 do
+	case " $* " in
+	*' '"$topic"' '*)
+		echo >&2 "* Skipping $topic"
+		continue ;;
+	esac
+
 	rebase= done= not_done= trouble= date=
 	topic_sha1=`git rev-parse --verify "refs/heads/$topic"`
 
diff --git a/TO b/TO
index 1ac8fb86..996a5bab 100755
--- a/TO
+++ b/TO
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 clean= next=next
+branch=`git symbolic-ref HEAD`
 while case $# in 0) break ;; esac
 do
 	case "$1" in
 	--clean)
-		branch=`git symbolic-ref HEAD` &&
 		test refs/heads/master = "$branch" || {
 			echo >&2 Not on master 
 			exit 1
@@ -40,6 +40,11 @@ while read topic
 do
 	rebase= done= not_done= trouble= date=
 	topic_sha1=`git rev-parse --verify "refs/heads/$topic"`
+	is_current=
+	if test "refs/heads/$topic" = "$branch"
+	then
+		is_current=" *"
+	fi
 
 	date=`
 		git-rev-list -1 --pretty "$topic" |
@@ -88,7 +93,7 @@ do
 		not_done="${LF}Up to date."
 	fi
 
-	echo "*** $topic ***$date$trouble$done$not_done"
+	echo "*** $topic ***$date$is_current$trouble$done$not_done"
 
 	if test -z "$trouble$not_done" &&
 	    test -n "$done" &&
diff --git a/jc.png b/jc.png
new file mode 100644
index 00000000..7b181d15
Binary files /dev/null and b/jc.png differ