From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id BD8F21F576 for ; Thu, 1 Feb 2018 10:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751909AbeBAKnG (ORCPT ); Thu, 1 Feb 2018 05:43:06 -0500 Received: from mx2.suse.de ([195.135.220.15]:49244 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751748AbeBAKnF (ORCPT ); Thu, 1 Feb 2018 05:43:05 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6FADDACD3; Thu, 1 Feb 2018 10:43:04 +0000 (UTC) Subject: Re: [PATCH] tag: add --edit option From: Nicolas Morey-Chaisemartin To: Eric Sunshine Cc: Git List References: <450140f4-d410-4f1a-e5c1-c56d345a7f7c@suse.com> Openpgp: preference=signencrypt Message-ID: Date: Thu, 1 Feb 2018 11:43:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:58.0) Gecko/20100101 Thunderbird/58.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: fr-xx-classique+reforme1990 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 >> 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 >>> --- >>> 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