Merge pull request #33

Fixing setup-git and setup-remote usage

Author: 56kyle

README.md

@@ -19,12 +19,12 @@ Once you have generated your project, and preferably before opening the IDE, the
 ```terminaloutput
 cd my-repo-name
 
-# Sets up a git repo w/ a main/develop branch along with an initial commit of everything just generated.
-uvx nox -s setup-git
-
 # Pins the uv python version, generates/syncs a venv, etc.
 uvx nox -s setup-venv
 
+# Sets up a git repo w/ a main/develop branch along with an initial commit of everything just generated.
+uvx nox -s setup-git
+
 # Sets up the remote reference and ensures main/develop are pushed/synced. Requires that the remote exists (should be empty).
 uvx nos -s setup-remote
 ```

{{cookiecutter.project_name}}/noxfile.py

@@ -45,18 +45,18 @@
 QUALITY: str = "quality"
 
 
-@nox.session(python=False, name="setup-git", tags=[ENV])
-def setup_git(session: Session) -> None:
-    """Set up the git repo for the current project."""
-    session.run("python", SCRIPTS_FOLDER / "setup-git.py", REPO_ROOT, external=True)
-
-
 @nox.session(python=False, name="setup-venv", tags=[ENV])
 def setup_venv(session: Session) -> None:
     """Set up the virtual environment for the current project."""
     session.run("python", SCRIPTS_FOLDER / "setup-venv.py", REPO_ROOT, "-p", PYTHON_VERSIONS[0], external=True)
 
 
+@nox.session(python=False, name="setup-git", tags=[ENV])
+def setup_git(session: Session) -> None:
+    """Set up the git repo for the current project."""
+    session.run("python", SCRIPTS_FOLDER / "setup-git.py", REPO_ROOT, external=True)
+
+
 @nox.session(python=False, name="setup-remote")
 def setup_remote(session: Session) -> None:
     """Set up the remote repository for the current project."""

{{cookiecutter.project_name}}/scripts/setup-git.py

@@ -23,10 +23,9 @@ def setup_git(path: Path) -> None:
     commands: list[list[str]] = [
         ["git", "init"],
         ["git", "branch", "-m", "master", "main"],
-        ["git", "checkout", "main"],
-        ["git", "checkout", "-b", "develop", "main"],
         ["git", "add", "."],
         ["git", "commit", "-m", "feat: initial commit"],
+        ["git", "checkout", "-b", "develop", "main"],
     ]
     check_dependencies(path=path, dependencies=["git"])
 

{{cookiecutter.project_name}}/scripts/setup-remote.py

@@ -21,10 +21,9 @@ def main() -> None:
 def setup_remote(path: Path, repository_host: str, repository_path: str) -> None:
     """Set up the provided cookiecutter-robust-python project's git repo."""
     commands: list[list[str]] = [
-        ["git", "fetch", "origin"],
         ["git", "remote", "add", "origin", f"https://{repository_host}/{repository_path}.git"],
         ["git", "remote", "set-url", "origin", f"https://{repository_host}/{repository_path}.git"],
-        ["git", "pull"],
+        ["git", "fetch", "origin"],
         ["git", "checkout", "main"],
         ["git", "push", "-u", "origin", "main"],
         ["git", "checkout", "develop"],