Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/push-cas'
author
Jonathan Nieder
<jrnieder@gmail.com>
Wed, 25 Sep 2013 06:22:03 +0000
(23:22 -0700)
committer
Jonathan Nieder
<jrnieder@gmail.com>
Wed, 25 Sep 2013 06:22:03 +0000
(23:22 -0700)
* jc/push-cas:
t5541: mark passing c-a-s test as success
t/lib-httpd.sh
patch
|
blob
|
history
raw
(from parent 1:
962393b
)
diff --git
a/t/lib-httpd.sh
b/t/lib-httpd.sh
index dab405d57479fe95dcb71b16a7a059410d2ae005..54dbbfe5ceeb9bf91cdad3393c2fdfe95c06fd18 100644
(file)
--- a/
t/lib-httpd.sh
+++ b/
t/lib-httpd.sh
@@
-169,7
+169,7
@@
test_http_push_nonff () {
test_i18ngrep "Updates were rejected because" output
'
- test_expect_
failure
'force with lease aka cas' '
+ test_expect_
${EXPECT_CAS_RESULT}
'force with lease aka cas' '
HEAD=$( cd "$REMOTE_REPO" && git rev-parse --verify HEAD ) &&
test_when_finished '\''
(cd "$REMOTE_REPO" && git update-ref HEAD "$HEAD")