Update git2 dependency

Author: alexcrichton

Cargo.toml

@@ -43,7 +43,7 @@ s3 = { path = "src/s3" }
 migrate = { path = "src/migrate" }
 rand = "0.3"
 time = "0.1"
-git2 = "0.2"
+git2 = "0.3"
 flate2 = "0.2"
 semver = "0.1.3"
 url = "0.2.0"

src/bin/server.rs

@@ -25,8 +25,10 @@ fn main() {
             fs::create_dir_all(&checkout).unwrap();
             let mut cb = git2::RemoteCallbacks::new();
             cb.credentials(cargo_registry::git::credentials);
+            let mut opts = git2::FetchOptions::new();
+            opts.remote_callbacks(cb);
             git2::build::RepoBuilder::new()
-                                     .remote_callbacks(cb)
+                                     .fetch_options(opts)
                                      .clone(&url, &checkout).unwrap()
         }
     };

src/git.rs

@@ -134,25 +134,21 @@ fn commit_and_push<F>(repo: &git2::Repository, mut f: F) -> CargoResult<()>
         let mut callbacks = git2::RemoteCallbacks::new();
         callbacks.credentials(credentials);
         let mut origin = try!(repo.find_remote("origin"));
-
-        origin.set_callbacks(callbacks);
-
-        {
-            let mut push = try!(origin.push());
-            try!(push.add_refspec("refs/heads/master"));
-
-            match push.finish() {
-                Ok(()) => {
-                    try!(push.update_tips(None, None));
-                    return Ok(())
-                }
-                Err(..) => {}
-            }
+        let mut opts = git2::PushOptions::new();
+        opts.remote_callbacks(callbacks);
+        match origin.push(&["refs/heads/master"], Some(&mut opts)) {
+            Ok(()) => return Ok(()),
+            Err(..) => {}
         }
 
+        let mut callbacks = git2::RemoteCallbacks::new();
+        callbacks.credentials(credentials);
+        try!(origin.update_tips(Some(&mut callbacks), true,
+                                git2::AutotagOption::Unspecified,
+                                None));
+
         // Ok, we need to update, so fetch and reset --hard
-        try!(origin.add_fetch("refs/heads/*:refs/heads/*"));
-        try!(origin.fetch(&[], None));
+        try!(origin.fetch(&["refs/heads/*:refs/heads/*"], None, None));
         let head = try!(repo.head()).target().unwrap();
         let obj = try!(repo.find_object(head, None));
         try!(repo.reset(&obj, git2::ResetType::Hard, None));

src/tests/git.rs

@@ -36,10 +36,9 @@ pub fn init() {
     let url = Url::from_file_path(&*bare()).ok().unwrap().to_string();
 
     // Setup the `origin` remote
-    let mut origin = checkout.remote("origin", &url).unwrap();
-    origin.set_pushurl(Some(&url)).unwrap();
-    origin.add_push("refs/heads/master").unwrap();
-    origin.save().unwrap();
+    checkout.remote_set_url("origin", &url).unwrap();
+    checkout.remote_set_pushurl("origin", Some(&url)).unwrap();
+    checkout.remote_add_push("origin", "refs/heads/master").unwrap();
 
     // Create an empty initial commit
     let mut config = checkout.config().unwrap();
@@ -55,15 +54,5 @@ pub fn init() {
 
     // Push the commit to the remote repo
     let mut origin = checkout.find_remote("origin").unwrap();
-    let mut push = origin.push().unwrap();
-    push.add_refspec("refs/heads/master").unwrap();
-    push.finish().unwrap();
-    assert!(!push.statuses().unwrap().iter().any(|s| s.message.is_some()));
-    push.update_tips(None, None).unwrap();
-
-    // Set up master to track origin/master
-    let branch = checkout.find_reference("refs/heads/master");
-    let mut branch = git2::Branch::wrap(branch.unwrap());
-    branch.set_upstream(Some("origin/master")).unwrap();
-
+    origin.push(&["refs/heads/master"], None).unwrap();
 }