git-copilot-commit 0.3.6__tar.gz → 0.3.7__tar.gz

{git_copilot_commit-0.3.6 → git_copilot_commit-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-copilot-commit
-Version: 0.3.6
+Version: 0.3.7
 Summary: Automatically generate and commit changes using copilot
 Author-email: Dheepak Krishnamurthy <1813121+kdheepak@users.noreply.github.com>
 License-File: LICENSE

{git_copilot_commit-0.3.6 → git_copilot_commit-0.3.7}/src/git_copilot_commit/cli.py

@@ -165,6 +165,27 @@ def generate_commit_message(
         return ask(fallback_prompt, model=model)
 
 
+def commit_with_retry_no_verify(
+    repo: GitRepository, message: str, use_editor: bool = False
+) -> str:
+    """Run commit and offer one retry with -n on failure."""
+    try:
+        return repo.commit(message, use_editor=use_editor)
+    except GitError as e:
+        console.print(f"[red]Commit failed: {e}[/red]")
+        if not Confirm.ask(
+            "Retry commit with [bold]`-n`[/] (skip hooks) using the same commit message?",
+            default=True,
+        ):
+            raise typer.Exit(1)
+
+    try:
+        return repo.commit(message, use_editor=use_editor, no_verify=True)
+    except GitError as retry_error:
+        console.print(f"[red]Commit with -n failed: {retry_error}[/red]")
+        raise typer.Exit(1)
+
+
 @app.command()
 def commit(
     all_files: bool = typer.Option(
@@ -255,11 +276,7 @@ def commit(
     # Confirm commit or edit message (skip if --yes flag is used)
     if yes:
         # Automatically commit with generated message
-        try:
-            commit_sha = repo.commit(commit_message)
-        except GitError as e:
-            console.print(f"[red]Commit failed: {e}[/red]")
-            raise typer.Exit(1)
+        commit_sha = commit_with_retry_no_verify(repo, commit_message)
     else:
         choice = typer.prompt(
             "Choose action: (c)ommit, (e)dit message, (q)uit",
@@ -273,18 +290,12 @@ def commit(
         elif choice == "e":
             # Use git's built-in editor with generated message as template
             console.print("[cyan]Opening git editor...[/cyan]")
-            try:
-                commit_sha = repo.commit(commit_message, use_editor=True)
-            except GitError as e:
-                console.print(f"[red]Commit failed: {e}[/red]")
-                raise typer.Exit(1)
+            commit_sha = commit_with_retry_no_verify(
+                repo, commit_message, use_editor=True
+            )
         elif choice == "c":
             # Commit with generated message
-            try:
-                commit_sha = repo.commit(commit_message)
-            except GitError as e:
-                console.print(f"[red]Commit failed: {e}[/red]")
-                raise typer.Exit(1)
+            commit_sha = commit_with_retry_no_verify(repo, commit_message)
         else:
             console.print("Invalid choice. Commit cancelled.")
             raise typer.Exit()

{git_copilot_commit-0.3.6 → git_copilot_commit-0.3.7}/src/git_copilot_commit/git.py

@@ -226,13 +226,19 @@ class GitRepository:
         else:
             self._run_git_command(["reset", "HEAD"] + paths)
 
-    def commit(self, message: str | None = None, use_editor: bool = False) -> str:
+    def commit(
+        self,
+        message: str | None = None,
+        use_editor: bool = False,
+        no_verify: bool = False,
+    ) -> str:
         """
         Create a commit with the given message or using git's editor.
 
         Args:
             message: Commit message. Used as template if use_editor is True.
             use_editor: Whether to use git's configured editor.
+            no_verify: Skip pre-commit and commit-msg hooks (git commit -n).
 
         Returns:
             Commit SHA.
@@ -253,7 +259,10 @@ class GitRepository:
                 temp_file = f.name
 
             try:
-                args = ["commit", "-e", "-F", temp_file]
+                args = ["commit"]
+                if no_verify:
+                    args.append("-n")
+                args.extend(["-e", "-F", temp_file])
 
                 # Run interactively without capturing output
                 cmd = ["git"] + args
@@ -273,7 +282,10 @@ class GitRepository:
         else:
             if message is None:
                 raise ValueError("message is required when use_editor is False")
-            args = ["commit", "-m", message]
+            args = ["commit"]
+            if no_verify:
+                args.append("-n")
+            args.extend(["-m", message])
 
             self._run_git_command(args)