Skip to content

Commit f45e40d

Browse files
committed
Remove incorrect and redundant options from git apply command line
In d0712f6 `patch -Np1 -i` was replaced with `git apply -Np1`, but `-N` flag has a different meaning in git: > mark new files with `git add --intent-to-add` Additionally the flag was added in v2.19.0, while git version used on perf.rust-lang.org is apparently older and execution fails with error: > unknown switch `N' The default behaviour of git apply should be sufficient to match the original one. Remove all flags from the command line.
1 parent d6d0634 commit f45e40d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

collector/src/execute.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,7 @@ impl Patch {
15501550
log::debug!("applying {} to {:?}", self.name, dir);
15511551

15521552
let mut cmd = Command::new("git");
1553-
cmd.current_dir(dir).args(&["apply"]).args(&["-Np1"]).arg(&*self.path);
1553+
cmd.current_dir(dir).args(&["apply"]).arg(&*self.path);
15541554

15551555
command_output(&mut cmd)?;
15561556

0 commit comments

Comments
 (0)