|
From: | Dmitry Gutov |
Subject: | bug#66113: Apply the entire diff buffer |
Date: | Tue, 26 Sep 2023 02:07:33 +0300 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 |
On 25/09/2023 20:49, Juri Linkov wrote:
I tried testing it out too. There is a patch where the third hunk doesn't apply (errors with "can't find the text to patch" in regular usage). This command ends with cryptic "No next hunk".This is what I expected that diff-hunk-next might signal an error that we should catch, but still couldn't find a patch that fails with such error. So I will try to construct such a patch manually.Try the patch attached to this message: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63896#5Thanks, I forgot about signatures in git patches. diff-mode already handles them in diff-fixup-modifs: ;; In git format-patch "^-- $" signifies ;; the end of the patch. (and (eq diff-buffer-type 'git) (looking-at "^-- $")) So I just copied this code here:
That works. Thanks!Ideally, I think point would move to the first failing hunk. But that's not urgent, could be a TODO for later.
Aside from that, I'm still not crazy about the binding. But that's not a technical issue.
[Prev in Thread] | Current Thread | [Next in Thread] |