auto merge of #1010 : alexcrichton/cargo/mingw, r=brson

This prevents having mismatches between bundled libs and libs on the system
(Cargo requires MinGW to compile regardless).

Author: bors

.travis.install.deps.sh

@@ -60,6 +60,8 @@ else
     mv '{app}' rustc
     # Don't use the bundled gcc, see rust-lang/rust#17442
     rm -rf rustc/bin/rustlib/$triple/bin
+    # Don't use bundled gcc libs, see rust-lang/rust#19519
+    rm -rf rustc/bin/rustlib/$triple/libmingw*.a
     rm -f rust-nightly-$triple.exe
 fi
 

Cargo.lock

@@ -415,7 +415,7 @@ pub fn fetch(repo: &git2::Repository, url: &str,
         let mut remote = try!(repo.remote_anonymous(url.as_slice(), refspec));
         try!(remote.add_fetch("refs/tags/*:refs/tags/*"));
         remote.set_callbacks(&mut cb);
-        try!(remote.fetch(None, None));
+        try!(remote.fetch(&["refs/tags/*:refs/tags/*", refspec], None, None));
         Ok(())
     })
 }

src/cargo/sources/git/utils.rs

@@ -169,7 +169,7 @@ Caused by:
 ",
         addr = addr,
         errmsg = if cfg!(windows) {
-            "Failed to send request: The connection with the server \
+            "failed to send request: The connection with the server \
              was terminated abnormally\n"
         } else {
             "SSL error: [..]"

tests/test_cargo_build_auth.rs

@@ -42,7 +42,7 @@ fn add(repo: &git2::Repository) {
     }
     let mut index = repo.index().unwrap();
     index.add_all(&["*"], git2::ADD_DEFAULT, Some(|a: &[u8], _b: &[u8]| {
-        if s.iter().any(|s| s.path().as_vec() == a) {1} else {0}
+        if s.iter().any(|s| a.starts_with(s.path().as_vec())) {1} else {0}
     })).unwrap();
     index.write().unwrap();
 }
@@ -53,7 +53,7 @@ fn add_submodule<'a>(repo: &'a git2::Repository, url: &str,
     let subrepo = s.open().unwrap();
     let mut origin = subrepo.find_remote("origin").unwrap();
     origin.add_fetch("refs/heads/*:refs/heads/*").unwrap();
-    origin.fetch(None, None).unwrap();
+    origin.fetch(&[], None, None).unwrap();
     origin.save().unwrap();
     subrepo.checkout_head(None).unwrap();
     s.add_finalize().unwrap();
@@ -979,7 +979,7 @@ test!(dep_with_changed_submodule {
         let mut origin = subrepo.find_remote("origin").unwrap();
         origin.set_url(git_project3.url().to_string().as_slice()).unwrap();
         origin.add_fetch("refs/heads/*:refs/heads/*").unwrap();;
-        origin.fetch(None, None).unwrap();
+        origin.fetch(&[], None, None).unwrap();
         origin.save().unwrap();
         let id = subrepo.refname_to_id("refs/remotes/origin/master").unwrap();
         let obj = subrepo.find_object(id, None).unwrap();