Auto merge of #5564 - mati865:metadata_fix, r=alexcrichton

Always replace metadata when replacing package

Fixes #4582

I'm having problem writing test for it.
The test should install binary, make commit and reinstall binary, this part is done.
To know if it was done properly we need to compare git revision of HEAD and installed binary and that's where the problems begin...

Author: bors

src/cargo/ops/cargo_install.rs

@@ -356,6 +356,11 @@ fn install_one(
                 set.remove(bin);
             }
         }
+        // Failsafe to force replacing metadata for git packages
+        // https://github.com/rust-lang/cargo/issues/4582
+        if let Some(set) = list.v1.remove(&pkg.package_id().clone()) {
+            list.v1.insert(pkg.package_id().clone(), set);
+        }
         list.v1
             .entry(pkg.package_id().clone())
             .or_insert_with(BTreeSet::new)

tests/testsuite/install.rs

@@ -3,12 +3,13 @@ use std::fs::{self, File, OpenOptions};
 use std::io::prelude::*;
 
 use cargo::util::ProcessBuilder;
-use cargotest::ChannelChanger;
 use cargotest::install::{cargo_home, has_installed_exe};
 use cargotest::support::git;
 use cargotest::support::paths;
 use cargotest::support::registry::Package;
 use cargotest::support::{execs, project};
+use cargotest::ChannelChanger;
+use git2;
 use hamcrest::{assert_that, existing_dir, is_not};
 
 fn cargo_process(s: &str) -> ProcessBuilder {
@@ -1533,3 +1534,50 @@ fn install_empty_argument() {
         ),
     );
 }
+
+#[test]
+fn git_repo_replace() {
+    let p = git::repo(&paths::root().join("foo"))
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            authors = []
+        "#,
+        )
+        .file("src/main.rs", "fn main() {}")
+        .build();
+    let repo = git2::Repository::open(&p.root()).unwrap();
+    let old_rev = repo.revparse_single("HEAD").unwrap().id();
+    assert_that(
+        cargo_process("install")
+            .arg("--git")
+            .arg(p.url().to_string()),
+        execs().with_status(0),
+    );
+    git::commit(&repo);
+    let new_rev = repo.revparse_single("HEAD").unwrap().id();
+    let mut path = paths::home();
+    path.push(".cargo/.crates.toml");
+
+    assert_ne!(old_rev, new_rev);
+    assert!(
+        fs::read_to_string(path.clone())
+            .unwrap()
+            .contains(&format!("{}", old_rev))
+    );
+    assert_that(
+        cargo_process("install")
+            .arg("--force")
+            .arg("--git")
+            .arg(p.url().to_string()),
+        execs().with_status(0),
+    );
+    assert!(
+        fs::read_to_string(path)
+            .unwrap()
+            .contains(&format!("{}", new_rev))
+    );
+}