]> git.proxmox.com Git - cargo.git/commit
projects / cargo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4100330 bb614d4)
Auto merge of #6850 - ehuss:fix-include_overrides_gitignore, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 15 Apr 2019 14:36:55 +0000 (14:36 +0000)
committerbors <bors@rust-lang.org>
Mon, 15 Apr 2019 14:36:55 +0000 (14:36 +0000)
commitef0223f12597b5e0d9d2feed1b92c41306b1fc05
tree062176c073af983cacf011583cac3956e7b11ee0tree
parent41003300629e789284c921c8deae52346e610ffbcommit | diff
parentbb614d4305c44606031a6b57dcdf7bbf386d7922commit | diff
Auto merge of #6850 - ehuss:fix-include_overrides_gitignore, r=alexcrichton

Fix test include_overrides_gitignore.

This test was added in #4180 and was disabled in #4218.  I don't think it is really feasible to get filetime into the test. The test was also using some questionable behavior of modifying contents of `src` from a `build.rs` script.  I rewrote the test to directly test the original change of having `package.include` override `.gitignore`.
backport for Debian buster