From c9634a7f8d71af11b842f4ff0c048c1e25f0573d Mon Sep 17 00:00:00 2001
From: Andy Stewart <lazycat.manatee@gmail.com>
Date: Sun, 6 Oct 2024 23:45:01 +0800
Subject: [PATCH] Fix hunk delete operation.

---
 .gitignore |  3 ++-
 buffer.py  | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 04ecdda..858b0f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 __pycache__
 node_modules/
 dist/
-tags
\ No newline at end of file
+tags
+.aider*
diff --git a/buffer.py b/buffer.py
index f9aa61e..0a7aad4 100644
--- a/buffer.py
+++ b/buffer.py
@@ -1012,10 +1012,12 @@ def status_delete_hunk(self, type, patch_index, hunk_index):
 
     def handle_discard_unstage_hunk(self):
         patch = copy(self.raw_patch_set[self.patch_index])
-        for index, hunk in enumerate(patch):
-            if index != self.hunk_index:
-                patch.remove(hunk)
-        result = get_command_result("cd {}; git apply --reverse".format(self.repo_root), str(patch))
+        hunk = patch[self.hunk_index]
+        hunk_str = str(hunk)
+
+        # Add diff header
+        hunk_str = f"diff --git a/{patch.path} b/{patch.path}\nindex 1234567..89abcdef 100644\n--- a/{patch.path}\n+++ b/{patch.path}\n{hunk_str}"
+        result = get_command_result("cd {}; git apply --reverse".format(self.repo_root), hunk_str)
 
         if result == "":
             message_to_emacs("Discard unstage hunk successfully!")
@@ -1026,14 +1028,15 @@ def handle_discard_unstage_hunk(self):
 
     def handle_discard_stage_hunk(self):
         patch = copy(self.raw_patch_set[self.patch_index])
-        for index, hunk in enumerate(patch):
-            if index != self.hunk_index:
-                patch.remove(hunk)
+        hunk = patch[self.hunk_index]
+        hunk_str = str(hunk)
 
-        result = get_command_result("cd {}; git apply --reverse --cached".format(self.repo_root), str(patch))
+        # Add diff header
+        hunk_str = f"diff --git a/{patch.path} b/{patch.path}\nindex 1234567..89abcdef 100644\n--- a/{patch.path}\n+++ b/{patch.path}\n{hunk_str}"
+        result = get_command_result("cd {}; git apply --reverse --cached".format(self.repo_root), hunk_str)
         if result == "":
             get_command_result("cd {}; git update-index --refresh")
-            result = get_command_result("cd {}; git apply --reverse".format(self.repo_root), str(patch))
+            result = get_command_result("cd {}; git apply --reverse".format(self.repo_root), hunk_str)
 
         if result == "":
             message_to_emacs("Discard this stage hunk successfully!")