From: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.de>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] tag: add --edit option
Date: Thu, 1 Feb 2018 11:43:03 +0100 [thread overview]
Message-ID: <bbc03595-cb31-63b8-3f4c-cfa04bb9ff27@suse.de> (raw)
In-Reply-To: <fb3387f9-a341-c4dc-fa37-581229fb2c1d@suse.de>
Le 01/02/2018 à 11:34, Nicolas Morey-Chaisemartin a écrit :
>
> Le 01/02/2018 à 11:16, Eric Sunshine a écrit :
>> On Thu, Feb 1, 2018 at 4:49 AM, Nicolas Morey-Chaisemartin
>> <nmoreychaisemartin@suse.com> wrote:
>>> Add a --edit option whichs allows modifying the messages provided by -m or -F,
>>> the same way git commit --edit does.
>>>
>>> Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
>>> ---
>>> diff --git a/builtin/tag.c b/builtin/tag.c
>>> @@ -224,7 +225,7 @@ static void create_tag(const struct object_id *object, const char *tag,
>>> - if (!opt->message_given) {
>>> + if (!opt->message_given || opt->use_editor) {
>>>
>>> - if (!is_null_oid(prev)) {
>>> + if (opt->message_given) {
>>> + write_or_die(fd, buf->buf, buf->len);
>>> + strbuf_reset(buf);
>>> + } else if (!is_null_oid(prev)) {
>>> write_tag_body(fd, prev);
>>> } else {
>> A little below this change is where launch_editor() is actually
>> invoked. If it fails for some reason, it prints:
>>
>> Please supply the message using either -m or -F option.
>>
>> which seems a bit counterintuitive if the user *did* specify one of
>> those options along with --edit. I wonder if that message needs to be
>> adjusted.
>>
> Yes I'll fix this.
I just checked what commit.c does and it seems to behave as my patch:
if (launch_editor(git_path_commit_editmsg(), NULL, env.argv)) {
fprintf(stderr,
_("Please supply the message using either -m or -F option.\n"));
exit(1);
}
To be honest the message is not that clear either.
If I'm reading launch_editor right most (or all) its falire are du to a failure to launch the editor or the editor crashed/exited with an error.
In this case, I wouldn't advise the user to use -m or -F but to fix its editor.
Nicolas
next prev parent reply other threads:[~2018-02-01 10:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-01 9:49 [PATCH] tag: add --edit option Nicolas Morey-Chaisemartin
2018-02-01 10:16 ` Eric Sunshine
2018-02-01 10:34 ` Nicolas Morey-Chaisemartin
2018-02-01 10:43 ` Nicolas Morey-Chaisemartin [this message]
2018-02-01 10:56 ` Eric Sunshine
2018-02-01 14:05 ` Nicolas Morey-Chaisemartin
2018-02-01 15:25 ` Ramsay Jones
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bbc03595-cb31-63b8-3f4c-cfa04bb9ff27@suse.de \
--to=nmoreychaisemartin@suse.de \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
/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 public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).