From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-2.7 required=3.0 tests=AWL,BAYES_00,BODY_8BITS, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 4D11E1F8C6 for ; Thu, 19 Aug 2021 02:07:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235618AbhHSCIY (ORCPT ); Wed, 18 Aug 2021 22:08:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235605AbhHSCIX (ORCPT ); Wed, 18 Aug 2021 22:08:23 -0400 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FECFC061764 for ; Wed, 18 Aug 2021 19:07:48 -0700 (PDT) Received: by mail-il1-x130.google.com with SMTP id i13so4335181ilm.11 for ; Wed, 18 Aug 2021 19:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=DO9ipCAJdEDoEWnAJuIfnGnZFGHGKXJVAOLNLK/2s8U=; b=rdhnFUPHv3vVK84QR/04MGnk0WZD1KTcpPr2IFfUJH7Mv5o9bECWg9+4b4tAmgIe5b UUQQ8nq0nyc67oN8MnIGnz3bwe7GwoP9INIe0bXvYlHwfJvjiwQP7k15kPGb4sexZz/9 YSwG7yTzpkNyZVGf5ly/nwSWm0DRqKU7aWFO+WahOSlqFfEeAxtozexv35yPUXcXlJ0/ nvNMygUU6E6brL3AQVQJNKnNTdUXmD9ODVrONl3RlXb4tVMZuQBSMf7MmJ8EwMMGXAaK Uzq7FKUMpwuMo9QOy2H+sr6iDZ6c7ChP4jndRmH+19MemTEaPcJMlnU+PQlROC52slEz jh0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=DO9ipCAJdEDoEWnAJuIfnGnZFGHGKXJVAOLNLK/2s8U=; b=q+jRQvL4PWACDcWO2d4qX6XY1folqKW5Fft70F3MEEAbLATaVthX7JSz8UlUDaanAj OMW/xcmHNwwnXNDjmoGHODlQHTeXihUrSOBqxL5Q5nkrHZLCmYdTl+P1wRa/js0zktTr k29DGd8VRbeJcpsic0Wy9bYngNCdK3/d+QWpnTyifU6HnRsrpOcRo8aAaoEX8kiezyxO yajO7SlE7baXmpZ5utumNlvOikwXnsIV/rGp9Z24OC6PG1jWA1jk7ZwoPylOAdBbIX7W eLCseZYc3BnorkGKqMksrM8PuhfKPrASOX0qY4fBpT4v+lDr8Dm5YrtLt86cCnbNrT52 +2hA== X-Gm-Message-State: AOAM531pPAGlfWQ2tx9/8bidrHtKyGTLl49GVl/HwYvfc4Q4W0Fra9Bl KcA2QhP4L81C+FWhZIAEnk1kdM5vE5oDnui0LUCSehwDipTkk+PY X-Google-Smtp-Source: ABdhPJyTgdN13pjtiabm4lcD4yjcWtI1pSAa6ZUsyGUoZ0snAehKS+W0at2OmDDe3q54+3os0/qDWZkBBGinSuiKNW4= X-Received: by 2002:a92:d282:: with SMTP id p2mr5970515ilp.259.1629338868066; Wed, 18 Aug 2021 19:07:48 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: ZheNing Hu Date: Thu, 19 Aug 2021 10:07:23 +0800 Message-ID: Subject: Re: [PATCH v5] [GSOC] cherry-pick: use better advice message To: phillip.wood@dunelm.org.uk Cc: ZheNing Hu via GitGitGadget , Git List , Junio C Hamano , Christian Couder , Hariom Verma , =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Han-Wen Nienhuys , Ramkumar Ramachandra , Felipe Contreras Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org ZheNing Hu =E4=BA=8E2021=E5=B9=B48=E6=9C=8819=E6= =97=A5=E5=91=A8=E5=9B=9B =E4=B8=8A=E5=8D=889:55=E5=86=99=E9=81=93=EF=BC=9A > > Phillip Wood =E4=BA=8E2021=E5=B9=B48=E6=9C=88= 18=E6=97=A5=E5=91=A8=E4=B8=89 =E4=B8=8B=E5=8D=885:51=E5=86=99=E9=81=93=EF= =BC=9A > > > > Thanks for making the revert advice better as well > > > > Thanks for reviewing too. > > > > else > > > advise(_("after resolving the conflicts, mark t= he corrected paths\n" > > > "with 'git add ' or 'git rm '\n" > > > > I think this last else arm should probably be a bug now as anything > > other than cherry-pick or revert should be setting GIT_CHERRY_PICK_HELP > > GIT_CHERRY_PICK_HELP should be set for other commands except cherry-pick and revert. > > else > > BUG("unexpected pick action in print_advice()"); > > > > Maybe you are right, If no one else will touch it, it may be > reasonable to set it as BUG(). > -- ZheNing