Skip to content

Commit

Permalink
auto merge of #325 : dotdash/cargo/git_no_template, r=alexcrichton
Browse files Browse the repository at this point in the history
I customized my git repo template to default to the standard pre-commit
hook that checks for e.g. trailing whitespace and refuses to commit if
any trailing whitespace was found. This causes some of cargo's tests to
fail.

To be independent of the user's git template, create the repo for the
test without using any, by specifying an empty template.
  • Loading branch information
bors committed Aug 5, 2014
2 parents 1b900de + 3ea15fd commit e58a698
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/test_cargo_compile_git_deps.rs
Expand Up @@ -30,7 +30,7 @@ fn git_repo(name: &str, callback: |ProjectBuilder| -> ProjectBuilder)
git_project.build();

log!(5, "git init");
try!(git_project.process("git").args(["init"]).exec_with_output());
try!(git_project.process("git").args(["init", "--template="]).exec_with_output());
log!(5, "building git project");
log!(5, "git add .");
try!(git_project.process("git").args(["add", "."]).exec_with_output());
Expand Down

0 comments on commit e58a698

Please sign in to comment.