Merge branch 'main' into refactor-repo

HISTORY.md

@@ -1,14 +1,14 @@
 # Release history
 
-### GitHub main branch
+### v0.10.0
 
-- Updated keyboard interrupt logic so that 2 ^C in 2 seconds always forces aider to exit.
-- Check pypi for newer versions and notify user.
-- Provide GPT with detailed error if it makes a bad edit block, ask for a retry.
-- Force `--no-pretty` if aider detects it is running inside a VSCode terminal.
+- Added `/git` command to run git from inside aider chats.
 - Use Meta-ENTER (Esc+ENTER in some environments) to enter multiline chat messages.
 - Create a `.gitignore` with `.aider*` to prevent users from accidentaly adding aider files to git.
-- Added `/git` command to run git from inside aider chats.
+- Check pypi for newer versions and notify user.
+- Updated keyboard interrupt logic so that 2 ^C in 2 seconds always forces aider to exit.
+- Provide GPT with detailed error if it makes a bad edit block, ask for a retry.
+- Force `--no-pretty` if aider detects it is running inside a VSCode terminal.
 - [Benchmarked](https://aider.chat/docs/benchmarks.html) at 64.7% for gpt-4/diff (no regression)
 
 

aider/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.1-dev"
+__version__ = "0.10.1-dev"

aider/main.py

@@ -27,7 +27,11 @@ def setup_git(git_root, io):
     if not io.confirm_ask("No git repo found, create one to track GPT's changes (recommended)?"):
         return
 
-    repo = git.Repo.init(Path.cwd())
+    git_root = str(Path.cwd().resolve())
+
+    check_gitignore(git_root, io, False)
+
+    repo = git.Repo.init(git_root)
     global_git_config = git.GitConfigParser([str(Path.home() / ".gitconfig")], read_only=True)
     with repo.config_writer() as git_config:
         if not global_git_config.has_option("user", "name"):
@@ -38,9 +42,8 @@ def setup_git(git_root, io):
             io.tool_error('Update git email with: git config --global user.email "you@example.com"')
 
     io.tool_output("Git repository created in the current working directory.")
-    git_root = str(Path.cwd().resolve())
-    check_gitignore(git_root, io, False)
-    return git_root
+
+    return repo.working_tree_dir
 
 
 def check_gitignore(git_root, io, ask=True):