Skip to content

Commit

Permalink
Auto merge of #1247 - tshepang:hgignore-love, r=alexcrichton
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Jan 29, 2015
2 parents 1e56839 + 087bc40 commit 174d232
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/cargo/ops/cargo_new.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ fn existing_vcs_repo(path: &Path) -> bool {
fn mk(config: &Config, path: &Path, name: &str,
opts: &NewOptions) -> CargoResult<()> {
let cfg = try!(global_config(config));
let mut ignore = "/target\n".to_string();
let mut ignore = "target\n".to_string();
let in_existing_vcs_repo = existing_vcs_repo(&path.dir_path());
if !opts.bin {
ignore.push_str("/Cargo.lock\n");
ignore.push_str("Cargo.lock\n");
}

let vcs = match (opts.version_control, cfg.version_control, in_existing_vcs_repo) {
Expand Down

0 comments on commit 174d232

Please sign in to comment.