From: Dmitry Gutov <dmitry@gutov.dev>
To: Juri Linkov <juri@linkov.net>
Cc: 66113@debbugs.gnu.org
Subject: bug#66113: Apply the entire diff buffer
Date: Tue, 26 Sep 2023 02:07:33 +0300 [thread overview]
Message-ID: <9555856c-6b67-1806-3f76-b418825f0046@gutov.dev> (raw)
In-Reply-To: <86r0mmywhb.fsf@mail.linkov.net>
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#5
> Thanks, 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.
next prev parent reply other threads:[~2023-09-25 23:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 6:46 bug#66113: Apply the entire diff buffer Juri Linkov
2023-09-22 1:38 ` Dmitry Gutov
2023-09-22 6:45 ` Juri Linkov
2023-09-22 13:49 ` Dmitry Gutov
2023-09-22 15:48 ` Juri Linkov
2023-09-23 17:52 ` Juri Linkov
2023-09-24 1:34 ` Dmitry Gutov
2023-09-24 7:34 ` Juri Linkov
2023-09-24 10:58 ` Dmitry Gutov
2023-09-25 17:49 ` Juri Linkov
2023-09-25 23:07 ` Dmitry Gutov [this message]
2023-09-27 17:36 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9555856c-6b67-1806-3f76-b418825f0046@gutov.dev \
--to=dmitry@gutov.dev \
--cc=66113@debbugs.gnu.org \
--cc=juri@linkov.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.