From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 137FF1F59D for ; Tue, 17 Jan 2023 15:34:27 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=QFOeBkT4; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232997AbjAQPdw (ORCPT ); Tue, 17 Jan 2023 10:33:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232691AbjAQPdi (ORCPT ); Tue, 17 Jan 2023 10:33:38 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3589F3FF20 for ; Tue, 17 Jan 2023 07:33:37 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id ud5so76261158ejc.4 for ; Tue, 17 Jan 2023 07:33:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:references:cc:to :content-language:subject:reply-to:user-agent:mime-version:date :message-id:from:from:to:cc:subject:date:message-id:reply-to; bh=WCtkzIJkb5UITkJpYqo2aFE22OnGHe6kwDl5aX/XhtA=; b=QFOeBkT4xpN9/bzVFhwG+QRV1h54BIAHldGYDIwkNW+WG/sAKbYz+qKBLWbQOZiqzf 0qKW1aG8MBZg087rCPoXtemHmTLVgj2diwYDUZP34yELhNj375Q0tCGiAgBlkRuGU80w thW5kWCeCyUHxaCQQgfwRTQ13B1+5TvBmf4bujJgnJiS1GVkwuvDUTcXLRdHg+PNWXTZ IiVkPlDCqs6uFLZrgCTc+0OcK/P/NrjMQDpM5qoPgiRRunQ7wSQiea6NUChBtXKlS4TL 2CaTWy8ipaDFEW+dKSJwqusNGcNDID3WdmYwFOAB9qToiLCL+3hLjPG3myTdQn5Ft5f8 4e9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:references:cc:to :content-language:subject:reply-to:user-agent:mime-version:date :message-id:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WCtkzIJkb5UITkJpYqo2aFE22OnGHe6kwDl5aX/XhtA=; b=3ZVLHMiGdSQ+6lNL4ygZ3nfBZRm7x6vBlrZ0VQID2YvByrewKsSVdtZQIyeFj1+yBE 6XJroA999WzbnOc7UGgYmjC9rvdQ3MAJXrLNCrRiPnwo3I1PmOwK/F96RQtz6vzWlM/6 rjOeLRuRJv0FImOpgFebtZVYt3mzcXn9cA1jgOeQwwSXldGIiJY4U4wmxaVEjp6jmO2v Ok9zYQ8OIeFmQc/JP7IGhgoUXcQxJgGZRmXSQ6/WL9k5JdryeD7hDYjuzwZmhL66KySM k5+sh7Qo1zI+QHuRX2YhOLyJbdDfQKjLsQUpiXKoQh66xZfn3z3aif93eNwb8YcCwxyN fvNw== X-Gm-Message-State: AFqh2kq2hi2FyYXFpFVklTxPijS2/WCDVg5lfoRO75F8Jenk2jz04+Hf 9SVNImMTD+lLLlsu6YXhi50= X-Google-Smtp-Source: AMrXdXv3JxCYFCm8Xs37oBAdzPVfYADICG3dYkVcCtxoYhD66NZzblxt73Jhq8rpy19M28VPU2tkvQ== X-Received: by 2002:a17:906:7101:b0:870:4f04:7ad0 with SMTP id x1-20020a170906710100b008704f047ad0mr3357737ejj.45.1673969615663; Tue, 17 Jan 2023 07:33:35 -0800 (PST) Received: from [192.168.1.74] ([31.185.185.212]) by smtp.gmail.com with ESMTPSA id b1-20020a1709063ca100b007af0f0d2249sm13331431ejh.52.2023.01.17.07.33.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jan 2023 07:33:35 -0800 (PST) From: Phillip Wood X-Google-Original-From: Phillip Wood Message-ID: <6d81f2d5-ed76-9855-04a9-89b6e3040da6@dunelm.org.uk> Date: Tue, 17 Jan 2023 15:33:34 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Reply-To: phillip.wood@dunelm.org.uk Subject: Re: [PATCH] rebase -i: allow a comment after a "break" command Content-Language: en-US To: Junio C Hamano , Jeff King Cc: Phillip Wood via GitGitGadget , git@vger.kernel.org, Olliver Schinagl , Johannes Schindelin , Elijah Newren , =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?UTF-8?Q?mason?= , Sergey Organov References: In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 13/01/2023 20:22, Junio C Hamano wrote: > Jeff King writes: > >> I had somewhat the opposite thought. The "break" command is special in >> that it is not doing anything useful except returning control to the >> user. And hence producing a message is a useful add-on. So I expected >> the patch to just allow: >> >> break this is a message the user will see >> >> without any "#" at all. > > Ah, I am OK with that, too. > >> That does close the door for further arguments, but I have trouble >> imagining what they would be. > > Making almost everything that the tool does not pay attention to > (like the patch title of "pick") into comments, floated by Elijah in > the thread, does sound another reasonable direction to go. If we > are not doing "pick 0f2d4b69 # the title of the commit", adding the > message without "#" to "break" might be a better way to go for > consistency. Indeed, it seems the question is whether we want to make the changes Elijah suggested - if so then we should use a "#" with the "break" command as well but if not then it I agree it would be better not have have "#" for comments with "break". My impression is that there is some support for Elijah's suggestion and no one has spoken up to oppose it so maybe we should go for that. Best Wishes Phillip