8 files changed, 107 insertions, 24 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 87403da780..cacb273aff 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -114,7 +114,8 @@ test_expect_success \
 test_expect_success \
     'some edit' \
     'mv file file.orig &&
-    sed -e "s/^3A/99/" -e "/^1A/d" < file.orig > file &&
+    sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" < file.orig > file &&
+    echo "incomplete" | tr -d "\\012" >>file &&
     GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
 
 test_expect_success \
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 49b5666b33..ee386cfbf3 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -391,6 +391,22 @@ EOF
 
 test_expect_success "rename succeeded" "diff -u expect .git/config"
 
+cat >> .git/config << EOF
+  [branch "zwei"] a = 1 [branch "vier"]
+EOF
+
+test_expect_success "remove section" "git config --remove-section branch.zwei"
+
+cat > expect << EOF
+# Hallo
+	#Bello
+[branch "drei"]
+weird
+EOF
+
+test_expect_success "section was removed properly" \
+	"diff -u expect .git/config"
+
 test_expect_success numbers '
 
 	git-config kilo.gram 1k &&
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 7d93d0d7c9..b1c97b0dfb 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -108,9 +108,9 @@ test_expect_success \
 	cd victim &&
 	git-config receive.denyNonFastforwards true &&
 	cd .. &&
-	git-update-ref refs/heads/master master^ &&
-	git-send-pack --force ./victim/.git/ master &&
-	! diff -u .git/refs/heads/master victim/.git/refs/heads/master
+	git-update-ref refs/heads/master master^ || return 1
+	git-send-pack --force ./victim/.git/ master && return 1
+	! diff .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_done
diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index 0514056ca6..0c0034e34c 100755
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -11,47 +11,91 @@ test_expect_success setup '
 	git-update-index --add a &&
 	tree0=$(git-write-tree) &&
 	commit0=$(echo setup | git-commit-tree $tree0) &&
-	git-update-ref HEAD $commit0 &&
-	git-clone ./. victim &&
 	echo We hope it works. >a &&
 	git-update-index a &&
 	tree1=$(git-write-tree) &&
 	commit1=$(echo modify | git-commit-tree $tree1 -p $commit0) &&
-	git-update-ref HEAD $commit1
+	git-update-ref refs/heads/master $commit0 &&
+	git-update-ref refs/heads/tofail $commit1 &&
+	git-clone ./. victim &&
+	GIT_DIR=victim/.git git-update-ref refs/heads/tofail $commit1 &&
+	git-update-ref refs/heads/master $commit1 &&
+	git-update-ref refs/heads/tofail $commit0
 '
 
+cat >victim/.git/hooks/pre-receive <<'EOF'
+#!/bin/sh
+echo "$@" >>$GIT_DIR/pre-receive.args
+read x; printf "$x" >$GIT_DIR/pre-receive.stdin
+echo STDOUT pre-receive
+echo STDERR pre-receive >&2
+EOF
+chmod u+x victim/.git/hooks/pre-receive
+
 cat >victim/.git/hooks/update <<'EOF'
 #!/bin/sh
-echo "$@" >$GIT_DIR/update.args
+echo "$@" >>$GIT_DIR/update.args
 read x; printf "$x" >$GIT_DIR/update.stdin
-echo STDOUT update
-echo STDERR update >&2
+echo STDOUT update $1
+echo STDERR update $1 >&2
+test "$1" = refs/heads/master || exit
 EOF
 chmod u+x victim/.git/hooks/update
 
+cat >victim/.git/hooks/post-receive <<'EOF'
+#!/bin/sh
+echo "$@" >>$GIT_DIR/post-receive.args
+read x; printf "$x" >$GIT_DIR/post-receive.stdin
+echo STDOUT post-receive
+echo STDERR post-receive >&2
+EOF
+chmod u+x victim/.git/hooks/post-receive
+
 cat >victim/.git/hooks/post-update <<'EOF'
 #!/bin/sh
-echo "$@" >$GIT_DIR/post-update.args
+echo "$@" >>$GIT_DIR/post-update.args
 read x; printf "$x" >$GIT_DIR/post-update.stdin
 echo STDOUT post-update
 echo STDERR post-update >&2
 EOF
 chmod u+x victim/.git/hooks/post-update
 
-test_expect_success push '
-	git-send-pack ./victim/.git/ master >send.out 2>send.err
+test_expect_failure push '
+	git-send-pack --force ./victim/.git master tofail >send.out 2>send.err
+'
+
+test_expect_success 'updated as expected' '
+	test $(GIT_DIR=victim/.git git-rev-parse master) = $commit1 &&
+	test $(GIT_DIR=victim/.git git-rev-parse tofail) = $commit1
 '
 
 test_expect_success 'hooks ran' '
+	test -f victim/.git/pre-receive.args &&
+	test -f victim/.git/pre-receive.stdin &&
 	test -f victim/.git/update.args &&
 	test -f victim/.git/update.stdin &&
+	test -f victim/.git/post-receive.args &&
+	test -f victim/.git/post-receive.stdin &&
 	test -f victim/.git/post-update.args &&
 	test -f victim/.git/post-update.stdin
 '
 
+test_expect_success 'pre-receive hook arguments' '
+	echo \
+	 refs/heads/master $commit0 $commit1 \
+	 refs/heads/tofail $commit1 $commit0 \
+	| diff - victim/.git/pre-receive.args
+'
+
 test_expect_success 'update hook arguments' '
+	(echo refs/heads/master $commit0 $commit1;
+	 echo refs/heads/tofail $commit1 $commit0
+	) | diff - victim/.git/update.args
+'
+
+test_expect_success 'post-receive hook arguments' '
 	echo refs/heads/master $commit0 $commit1 |
-	diff -u - victim/.git/update.args
+	diff - victim/.git/post-receive.args
 '
 
 test_expect_success 'post-update hook arguments' '
@@ -59,23 +103,32 @@ test_expect_success 'post-update hook arguments' '
 	diff -u - victim/.git/post-update.args
 '
 
-test_expect_failure 'update hook stdin is /dev/null' '
-	test -s victim/.git/update.stdin
-'
-
-test_expect_failure 'post-update hook stdin is /dev/null' '
-	test -s victim/.git/post-update.stdin
+test_expect_success 'all hook stdin is /dev/null' '
+	! test -s victim/.git/pre-receive.stdin &&
+	! test -s victim/.git/update.stdin &&
+	! test -s victim/.git/post-receive.stdin &&
+	! test -s victim/.git/post-update.stdin
 '
 
 test_expect_failure 'send-pack produced no output' '
 	test -s send.out
 '
 
+cat <<EOF >expect
+STDOUT pre-receive
+STDERR pre-receive
+STDOUT update refs/heads/master
+STDERR update refs/heads/master
+STDOUT update refs/heads/tofail
+STDERR update refs/heads/tofail
+STDOUT post-receive
+STDERR post-receive
+STDOUT post-update
+STDERR post-update
+EOF
 test_expect_success 'send-pack stderr contains hook messages' '
-	grep "STDOUT update" send.err &&
-	grep "STDERR update" send.err &&
-	grep "STDOUT post-update" send.err &&
-	grep "STDERR post-update" send.err
+	egrep ^STD send.err >actual &&
+	diff - actual <expect
 '
 
 test_done
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 765c83fda7..0b600bb429 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -114,6 +114,7 @@ done >> tests
 # neither in the Pull: or .fetch config
 for branch in master br-unconfig ; do
     cat <<EOF
+$branch ../.git
 $branch ../.git one
 $branch ../.git one two
 $branch --tags ../.git
diff --git a/t/t5515/fetch.br-unconfig_.._.git b/t/t5515/fetch.br-unconfig_.._.git
new file mode 100644
index 0000000000..284bb1fb61
--- /dev/null
+++ b/t/t5515/fetch.br-unconfig_.._.git
@@ -0,0 +1,2 @@
+# br-unconfig ../.git
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		../
diff --git a/t/t5515/fetch.master_.._.git b/t/t5515/fetch.master_.._.git
new file mode 100644
index 0000000000..66d1aaddae
--- /dev/null
+++ b/t/t5515/fetch.master_.._.git
@@ -0,0 +1,2 @@
+# master ../.git
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		../
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 970d683650..2e1a09ff2d 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -111,6 +111,14 @@ test_expect_success \
 	'A: verify marks output' \
 	'diff -u expect marks.out'
 
+test_expect_success \
+	'A: verify marks import' \
+	'git-fast-import \
+		--import-marks=marks.out \
+		--export-marks=marks.new \
+		</dev/null &&
+	diff -u expect marks.new'
+
 ###
 ### series B
 ###