diff --git a/Make b/Make
index 607ee29756..698d93625b 100755
--- a/Make
+++ b/Make
@@ -53,27 +53,26 @@ do
 	)
 done
 
-Wall='-Wall -Wdeclaration-after-statement' tests= jobs=
+Wall='-Wall -Wdeclaration-after-statement' tests= jobs= skip=
 case `hostname` in
-fc13i386)
-	GIT_SKIP_TESTS="t9??? $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
+fc13i386 | fc15i686)
+	skip="t9???"
 	;;
 esac
 case `uname` in
 OpenBSD)
 	NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
-	GIT_SKIP_TESTS="t9200 t9502 $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
+	skip="t9200 t9502"
 	SHELL_PATH=/usr/local/bin/bash; export SHELL_PATH
 	NO_PEDANTIC=CannotDo NO_JOBS=CannotDo
 	Wall=
 	;;
 FreeBSD)
 	OLD_ICONV=YesPlease; export OLD_ICONV
-	GIT_SKIP_TESTS="t5560 $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
+	skip="t5560"
 	;;
 SunOS)
 	NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
-	GIT_SKIP_TESTS="$GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
 	NO_PEDANTIC=CannotDo Wall=
 	;;
 esac
@@ -134,6 +133,11 @@ do
 	shift
 done
 
+if test -z "$tests" && test -n "$skip"
+then
+	: GIT_SKIP_TESTS="${GIT_SKIP_TESTS:-$skip}"
+fi
+
 LC_ALL=$LANG
 export LANG LC_ALL
 
diff --git a/TODO b/TODO
index fdd2758446..1271bbbfb4 100644
--- a/TODO
+++ b/TODO
@@ -8,6 +8,19 @@ The latest copy of this document is found at
 
 ----------------------------------------------------------------
 
+gmane=http://thread.gmane.org/gmane.comp.version-control.git/
+
+* Teach pack protocol to transfer estimated pack size and history
+  depth to allow receiving end make more intelligent decision between
+  unpack-objects and index-pack.
+
+  $gmane/173610
+
+* The "combined" diff always assumes it deals with text files. Teach it
+  to punt on binary and also use the textconv.
+
+  $gname/171613
+
 * Audit use of symbolic-ref without -m in our scripts and for each
   case decide if leaving a reflog entry for the HEAD is desirable.
   If so, add them.
diff --git a/cook b/cook
index fc11734aef..81e45d700b 100755
--- a/cook
+++ b/cook
@@ -627,7 +627,7 @@ sub wildo {
 		}
 		next if (/^ /);
 		if (defined $topic &&
-		    /Will (?:\S+ )?merge /i) {
+		    /Will (?:\S+ )?(merge|drop|discard|cook)[. ]/i) {
 			wildo_queue(\%what, $_, $topic);
 			$topic = undef;
 		}
diff --git a/pre-applypatch b/pre-applypatch
index ae85e5a2d6..4e6dbebd6f 100755
--- a/pre-applypatch
+++ b/pre-applypatch
@@ -27,6 +27,6 @@ then
 	done
 	if test -n "$bad"
 	then
-		exit 1
+		: exit 1
 	fi
 fi
diff --git a/worklog b/worklog
index 99a6a682f5..c2ee60ce03 100755
--- a/worklog
+++ b/worklog
@@ -259,7 +259,7 @@ sub day_summary {
 	if (exists $tag_by_date{$date}) {
 		for my $tagname (@{$tag_by_date{$date}}) {
 			$$total_tags++;
-			print " Tagged $tagname.\n" if (!$quiet);
+			print "Tagged $tagname.\n" if (!$quiet);
 		}
 	}