Skip to content

fix: handle git config lock errors gracefully #5084

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

Open
Kcstring wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −5
Open

fix: handle git config lock errors gracefully #5084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions aider/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,20 @@ def setup_git(git_root, io):
if user_name and user_email:
return repo.working_tree_dir

with repo.config_writer() as git_config:
try:
with repo.config_writer() as git_config:
if not user_name:
git_config.set_value("user", "name", "Your Name")
io.tool_warning('Update git name with: git config user.name "Your Name"')
if not user_email:
git_config.set_value("user", "email", "you@example.com")
io.tool_warning('Update git email with: git config user.email "you@example.com"')
except OSError as err:
io.tool_warning(f"Unable to update git config automatically: {err}")
if not user_name:
git_config.set_value("user", "name", "Your Name")
io.tool_warning('Update git name with: git config user.name "Your Name"')
io.tool_warning('Set git name with: git config user.name "Your Name"')
if not user_email:
git_config.set_value("user", "email", "you@example.com")
io.tool_warning('Update git email with: git config user.email "you@example.com"')
io.tool_warning('Set git email with: git config user.email "you@example.com"')

return repo.working_tree_dir

Expand Down
16 changes: 16 additions & 0 deletions tests/basic/test_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,22 @@ def test_setup_git(self):
self.assertTrue(gitignore.exists())
self.assertEqual(".aider*", gitignore.read_text().splitlines()[0])

def test_setup_git_handles_config_writer_lock(self):
with IgnorantTemporaryDirectory() as git_dir:
git.Repo.init(git_dir)
io = MagicMock()
with patch.object(git.Repo, "config_writer", side_effect=OSError("config.lock exists")):
git_root = setup_git(str(git_dir), io)

self.assertEqual(Path(git_root).resolve(), Path(git_dir).resolve())
io.tool_warning.assert_any_call(
"Unable to update git config automatically: config.lock exists"
)
io.tool_warning.assert_any_call('Set git name with: git config user.name "Your Name"')
io.tool_warning.assert_any_call(
'Set git email with: git config user.email "you@example.com"'
)

def test_check_gitignore(self):
with GitTemporaryDirectory():
os.environ["GIT_CONFIG_GLOBAL"] = "globalgitconfig"
Expand Down