Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
push: teach --force-with-lease to smart-http transport
[gitweb.git]
/
t
/
lib-httpd.sh
diff --git
a/t/lib-httpd.sh
b/t/lib-httpd.sh
index e2eca1fad0c1d06d37d3567c513ca565663707cf..dab405d57479fe95dcb71b16a7a059410d2ae005 100644
(file)
--- a/
t/lib-httpd.sh
+++ b/
t/lib-httpd.sh
@@
-141,10
+141,11
@@
stop_httpd() {
-f "$TEST_PATH/apache.conf" $HTTPD_PARA -k stop
}
-test_http_push_nonff() {
+test_http_push_nonff
() {
REMOTE_REPO=$1
LOCAL_REPO=$2
BRANCH=$3
+ EXPECT_CAS_RESULT=${4-failure}
test_expect_success 'non-fast-forward push fails' '
cd "$REMOTE_REPO" &&