diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-03 12:03:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-03 12:12:50 -0400 |
| commit | f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d (patch) | |
| tree | 29bb0536642023b761f9c7188e2532749579e5f2 /doc/todo/windows_support.mdwn | |
| parent | f0c652b2a9ebc29e734316b8f87770fc8960aae2 (diff) | |
fix test suite to pass on windows
On windows, the sync of the second cloned repo to origin failed, because
synced/master was a non-fast-forward. This may be a bug of its own, but
it's not the issue that this test was intended to test, so disconnect
the repos from origin before syncing.
Diffstat (limited to 'doc/todo/windows_support.mdwn')
| -rw-r--r-- | doc/todo/windows_support.mdwn | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/doc/todo/windows_support.mdwn b/doc/todo/windows_support.mdwn index f6d08d25d..777c946a6 100644 --- a/doc/todo/windows_support.mdwn +++ b/doc/todo/windows_support.mdwn @@ -12,9 +12,6 @@ now! --[[Joey]] is much slower than on systems supporting connection caching. * The test suite does not 100% pass, although it seems to be getting quite close! Current known failures: - * "conflict_resolution (mixed directory and file)" test fails; - not because the conflict resolution fails, but the sync fails - pushing to synced/master with a non-fast-forward failure. * Some tests fail if git has not had the username and email configured. This is odd because the test suite goes to some lengths to get env vars set to prevent this problem. |