Skip to content

Ensure git checkout works with untracked files #14428

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 25, 2025
Merged

Ensure git checkout works with untracked files #14428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a284d3
Ensure git checkout works with untracked files
josevalim Apr 11, 2025
b6e9edd
Add tests
josevalim Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/scm/git.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ defmodule Mix.SCM.Git do

# Migrate the Git repo
rev = lock_rev || get_origin_opts_rev(opts) || default_branch()
git!(["--git-dir=.git", "checkout", "--quiet", rev])
git!(["--git-dir=.git", "checkout", "--force", "--quiet", rev])

if opts[:submodules] do
git!(~w[-c core.hooksPath='' --git-dir=.git submodule update --init --recursive])
Expand Down
10 changes: 10 additions & 0 deletions lib/mix/test/mix/tasks/deps.git_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,14 @@ defmodule Mix.Tasks.DepsGitTest do
Mix.State.clear_cache()
purge([DepsOnGitRepo.MixProject])

# Write to the checkout location to ensure it is replaced
File.mkdir_p!("deps/deps_on_git_repo/lib")
File.write!("deps/deps_on_git_repo/lib/deps_on_git_repo.ex", "# WILL BE OVERRIDDEN")

Mix.Tasks.Deps.Update.run(["deps_on_git_repo"])
assert File.exists?("deps/git_repo/lib/git_repo.ex")
assert File.read!("mix.lock") =~ last
assert File.read!("deps/deps_on_git_repo/lib/deps_on_git_repo.ex") =~ "GitRepo.hello()"
refute File.exists?("_build/dev/lib/git_repo/.mix/compile.fetch")
end)
after
Expand All @@ -427,10 +432,15 @@ defmodule Mix.Tasks.DepsGitTest do
Mix.State.clear_cache()
purge([DepsOnGitRepo.MixProject])

# Write to the checkout location to ensure it is replaced
File.mkdir_p!("deps/deps_on_git_repo/lib")
File.write!("deps/deps_on_git_repo/lib/deps_on_git_repo.ex", "# WILL BE OVERRIDDEN")

Mix.Dep.Lock.write(%{deps_on_git_repo: {:git, fixture_path("deps_on_git_repo"), last, []}})
Mix.Tasks.Deps.Get.run([])
assert File.exists?("deps/git_repo/lib/git_repo.ex")
assert File.read!("mix.lock") =~ last
assert File.read!("deps/deps_on_git_repo/lib/deps_on_git_repo.ex") =~ "GitRepo.hello()"
refute File.exists?("_build/dev/lib/git_repo/.mix/compile.fetch")
end)
after
Expand Down
Loading