Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean environment when git-fetch-with-cli is used. #7082

Merged
merged 1 commit into from
Jun 29, 2019

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 29, 2019

When the GIT_DIR environment variable is set, git-the-cli will use that instead of looking at cwd. This can happen, for example, when using the exec command in git rebase to call cargo. This causes cargo to fetch into the wrong directory.

Closes #7072

@rust-highfive
Copy link

r? @Eh2406

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 29, 2019
@lukaslueg
Copy link
Contributor

Just my two cents, wouldn't it be overkill to clear the entire environment before executing the git cli? As cargo uses the cli for a very specific purpose, noone has any business setting any env-flags anyway. SSH maybe?

@ehuss
Copy link
Contributor Author

ehuss commented Jun 29, 2019

I thought about that, but I think there are various curl and ssh environment variables that should be kept. It seemed like a remove-list would be easier to maintain than an allow-list.

@Eh2406
Copy link
Contributor

Eh2406 commented Jun 29, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jun 29, 2019

📌 Commit 00fd31d has been approved by Eh2406

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 29, 2019
@bors
Copy link
Contributor

bors commented Jun 29, 2019

⌛ Testing commit 00fd31d with merge 143aaed...

bors added a commit that referenced this pull request Jun 29, 2019
Clean environment when git-fetch-with-cli is used.

When the GIT_DIR environment variable is set, git-the-cli will use that instead of looking at cwd.  This can happen, for example, when using the `exec` command in `git rebase` to call cargo.  This causes cargo to fetch into the wrong directory.

Closes #7072
@bors
Copy link
Contributor

bors commented Jun 29, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Eh2406
Pushing 143aaed to master...

@bors bors merged commit 00fd31d into rust-lang:master Jun 29, 2019
bors added a commit to rust-lang/rust that referenced this pull request Jul 10, 2019
Update cargo

Update cargo

12 commits in 4c1fa54d10f58d69ac9ff55be68e1b1c25ecb816..677a180f4c8ca1dcef594f68dd0e63e4f08621f5
2019-06-24 11:24:18 +0000 to 2019-07-08 13:43:02 +0000
- Update dependencies (rust-lang/cargo#7106)
- Fix overwriting .d file for binary with dSYM on apple targets. (rust-lang/cargo#7057)
- Update changelog. (rust-lang/cargo#7102)
- Revert "Fix 'getting started' internal links" (rust-lang/cargo#7099)
- Bump to 0.39.0 (rust-lang/cargo#7100)
- Update dependency.rs (rust-lang/cargo#7098)
- Typo (rust-lang/cargo#7097)
- Fix 'getting started' internal links (rust-lang/cargo#7093)
- Fix misleading comment in testsuite (rust-lang/cargo#7090)
- improve uncommitted changes cargo-package message (rust-lang/cargo#7083)
- Clean environment when git-fetch-with-cli is used. (rust-lang/cargo#7082)
- Fix exponentiality in depend_on_deps_of_deps. (rust-lang/cargo#7062)
@ehuss ehuss added this to the 1.38.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Git repository gets messed up with git-fetch-with-cli = true
5 participants