From: Christoph Badura <bad@bsd.de>
To: 72341@debbugs.gnu.org
Subject: bug#72341: VC: CVS template lines not stripped when committing
Date: Sun, 28 Jul 2024 21:48:30 +0200 [thread overview]
Message-ID: <20240728194830.GB19989@irregular-apocalypse.k.bsd.de> (raw)
In-Reply-To: <86plqxz9t0.fsf@gnu.org>
Resending the message, because debbugs.gnu.org wasn't cc'ed on the
original reply.
On Sun, Jul 28, 2024 at 08:49:15PM +0300, Eli Zaretskii wrote:
> I'm confused by your description. At the beginning you say:
>
> CVS strips all lines beginning with "CVS: " after editing the commit
> message.
>
> But later you say:
>
> However, the lines starting with "CVS: " aren't stripped out when
> log-edit-done is called. The change is then committed with
> "cvs ci -m" which does not strip these line, as the template file is
> only loaded when cvs invokes an editor to edit the commit message.
CVS only adds the template file and later strips the "CVS: " lines if
you actually edit the commit message in an editor (which is invoked by
cvs). I.e. if you do not pass a commit message via "cvs ci -m'message'"
or "cvs ci -F messagefile".
> If "cvs ci -m" doesn't strip the "CVS: " lines, then when and how does
> the stripping you describe at the beginning happens? And what does
> the last part of the last sentence above, about the template file
> being loaded when CVS invokes an editor, has to do with this issue?
When invoked as "cvs ci -m" (or "cvs ci -F") cvs uses the commit message
*as is*. With either option, cvs itself doesn't add the template file to
the commit message and hence doesn't have to do any stripping.
log-edit-insert-cvs-template adds the CVS template file to the commit
message outside of cvs. Therefore log-edit has to strip the "CVS: " lines
outside of cvs too.
Is that clearer?
--chris
--chris
next prev parent reply other threads:[~2024-07-28 19:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-28 12:32 bug#72341: VC: CVS template lines not stripped when committing Christoph Badura
2024-07-28 17:49 ` Eli Zaretskii
2024-07-28 19:48 ` Christoph Badura [this message]
[not found] ` <20240728192115.GY9440@irregular-apocalypse.k.bsd.de>
2024-07-29 2:26 ` Eli Zaretskii
2024-07-29 9:53 ` Christoph Badura
2024-07-29 12:34 ` Eli Zaretskii
2024-07-29 15:02 ` Christoph Badura
2024-07-30 13:35 ` Dmitry Gutov
2024-08-02 7:19 ` Eli Zaretskii
2024-08-09 15:11 ` Christoph Badura
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=20240728194830.GB19989@irregular-apocalypse.k.bsd.de \
--to=bad@bsd.de \
--cc=72341@debbugs.gnu.org \
/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.