diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:22:03 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:22:03 -0700 |
| commit | 1939ce67ed0da6d1819e7c711daaffae2e0a2713 (patch) | |
| tree | 5e06b5dcdf5dd7f706a543a52b502602e7cb78cf | |
| parent | 962393b5d9744ee124acb74d6c4cf0e162d12e9a (diff) | |
| parent | 42aa29ee12bbc769567c4c8ed694566511ef2e39 (diff) | |
| download | git-1939ce67ed0da6d1819e7c711daaffae2e0a2713.tar.gz | |
Merge branch 'jc/push-cas'
* jc/push-cas:
t5541: mark passing c-a-s test as success
| -rw-r--r-- | t/lib-httpd.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index dab405d574..54dbbfe5ce 100644 --- 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") |