git - Error: "patch does not apply" when manually editing diff - Stack Overflow

admin管理员组

文章数量:1317898

I have the following git diff for Python code:

@@ -520,7 +520,7 @@ class AreaManager:
         self.broadcast_ooc(
             f"[{client.id}] {client.showname} ({client.name}) is GM in this hub now."
         )
-        #client.hide(True)
+        client.hide(True)
 
     def remove_owner(self, client):
         """

I want to discard changes using git add -i by removing the '+' line and restoring the '-' line. I do it as this:

@@ -520,7 +520,7 @@ class AreaManager:
         self.broadcast_ooc(
             f"[{client.id}] {client.showname} ({client.name}) is GM in this hub now."
         )
         #client.hide(True)
 
     def remove_owner(self, client):
         """

I've read these SO questions as well as this blog post, and kept track of spaces and line count, but Git still produces an error: error: corrupt patch at line 13

How do I make Git apply my changes? What am I missing?

I use Notepad++ v8.4.2 as Git default code editor under Win10 OS.

I have the following git diff for Python code:

@@ -520,7 +520,7 @@ class AreaManager:
         self.broadcast_ooc(
             f"[{client.id}] {client.showname} ({client.name}) is GM in this hub now."
         )
-        #client.hide(True)
+        client.hide(True)
 
     def remove_owner(self, client):
         """

I want to discard changes using git add -i by removing the '+' line and restoring the '-' line. I do it as this:

@@ -520,7 +520,7 @@ class AreaManager:
         self.broadcast_ooc(
             f"[{client.id}] {client.showname} ({client.name}) is GM in this hub now."
         )
         #client.hide(True)
 
     def remove_owner(self, client):
         """

I've read these SO questions as well as this blog post, and kept track of spaces and line count, but Git still produces an error: error: corrupt patch at line 13

How do I make Git apply my changes? What am I missing?

I use Notepad++ v8.4.2 as Git default code editor under Win10 OS.

• git
• patch
• interactive
• git-diff
• git-add

Share Improve this question Follow edited Jan 24 at 9:30 Guildenstern 3,89822 gold badges2828 silver badges5353 bronze badges asked Jan 22 at 15:25 user27575278user27575278 933 bronze badges 1

• there are some long standing bugs related to this kind of patch editing. An alternate way is to open git gui, and use the graphical interface to amend your changes – LeGEC Commented Jan 22 at 15:32

Add a comment  | 

1 Answer 1

Sorted by: Reset to default 0

Thanks @LeGEC for suggesting using git gui, amending changes there solved the problem.

本文标签： gitError quotpatch does not applyquot when manually editing diffStack Overflow