Update git2-curl to rust master

alexcrichton · Mar 15, 2015 · 907e14c · 907e14c
1 parent 396d8ce
commit 907e14c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/git2-curl/Cargo.toml b/git2-curl/Cargo.toml
@@ -26,6 +26,7 @@ version = "0.2"
 civet = "0.7"
 conduit = "0.7"
 conduit-git-http-backend = "0.7"
+tempdir = "0.3"
 
 [[test]]
 name = "all"

diff --git a/git2-curl/tests/all.rs b/git2-curl/tests/all.rs
@@ -1,19 +1,16 @@
-#![feature(path, io, fs, old_io, old_path)]
-
+extern crate "conduit-git-http-backend" as git_backend;
+extern crate "git2-curl" as git2_curl;
 extern crate civet;
 extern crate conduit;
-extern crate git2;
 extern crate curl;
-extern crate "git2-curl" as git2_curl;
-extern crate "conduit-git-http-backend" as git_backend;
+extern crate git2;
+extern crate tempdir;
 
 use civet::{Server, Config};
 use std::fs::File;
 use std::path::Path;
 use tempdir::TempDir;
 
-mod tempdir;
-
 const PORT: u16 = 7848;
 
 fn main() {
@@ -61,11 +58,11 @@ fn main() {
     }
 
     let mut remote = r.find_remote("origin").unwrap();
-    remote.fetch(&["refs/heads/*:refs/heads/*"], None, None).unwrap();
+    remote.fetch(&["refs/heads/*:refs/heads/*"], None).unwrap();
     let b = r.find_branch("master", git2::BranchType::Local).unwrap();
     let id = b.get().target().unwrap();
     let obj = r.find_object(id, None).unwrap();
-    r.reset(&obj, git2::ResetType::Hard, None, None, None).unwrap();;
+    r.reset(&obj, git2::ResetType::Hard, None).unwrap();;
 
     assert!(File::open(&td2.path().join("bar")).is_ok());
 }