X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft5401-update-hooks.sh;h=f1c7ff0c0a8082d260b136fa641a3f109172b7e6;hb=dca3957b8581ffd0faab135191bbee3029953bd2;hp=0514056ca6e8e54101b378cafd76b22a81df0ff5;hpb=ea44949605781d1947ba1422ee541867e7ce9b81;p=git.git

diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index 0514056ca..f1c7ff0c0 100755
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -11,71 +11,126 @@ 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
+printf "$@" >>$GIT_DIR/pre-receive.args
+cat - >$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
+printf "$@" >>$GIT_DIR/post-receive.args
+cat - >$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 input' '
+	(echo $commit0 $commit1 refs/heads/master;
+	 echo $commit1 $commit0 refs/heads/tofail
+	) | git diff - victim/.git/pre-receive.stdin
+'
+
 test_expect_success 'update hook arguments' '
-	echo refs/heads/master $commit0 $commit1 |
-	diff -u - victim/.git/update.args
+	(echo refs/heads/master $commit0 $commit1;
+	 echo refs/heads/tofail $commit1 $commit0
+	) | git diff - victim/.git/update.args
+'
+
+test_expect_success 'post-receive hook input' '
+	echo $commit0 $commit1 refs/heads/master |
+	git diff - victim/.git/post-receive.stdin
 '
 
 test_expect_success 'post-update hook arguments' '
 	echo refs/heads/master |
-	diff -u - victim/.git/post-update.args
+	git diff - victim/.git/post-update.args
 '
 
-test_expect_failure 'update hook stdin is /dev/null' '
-	test -s victim/.git/update.stdin
+test_expect_success 'all hook stdin is /dev/null' '
+	! test -s victim/.git/update.stdin &&
+	! test -s victim/.git/post-update.stdin
 '
 
-test_expect_failure 'post-update hook stdin is /dev/null' '
-	test -s victim/.git/post-update.stdin
+test_expect_success 'all *-receive hook args are empty' '
+	! test -s victim/.git/pre-receive.args &&
+	! test -s victim/.git/post-receive.args
 '
 
 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 &&
+	git diff - actual <expect
 '
 
 test_done