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: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 57E0E1F54E for ; Tue, 16 Aug 2022 10:43:26 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="jmo3MGbt"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234989AbiHPKnV (ORCPT ); Tue, 16 Aug 2022 06:43:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234421AbiHPKmy (ORCPT ); Tue, 16 Aug 2022 06:42:54 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDAB1EEF08 for ; Tue, 16 Aug 2022 03:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1660644010; bh=WR40s5quqoMnKj5u1ll3udqvIt6r0ZhstdhvNbCfctY=; h=X-UI-Sender-Class:Date:From:To:cc:Subject:In-Reply-To:References; b=jmo3MGbtLxXHWaEJPOiCuGmzOtEElR52U52qi1EtgWtOgbjWGMb09JpP42BC1luRm wZk+bffOagYOhwi59jWYf4PU1VZdMDKtDMkr2lOS+Fb0c/h8UOFFpq6Yca6aRXgHR6 uoohiHX9l5mnsdPqkGIAzDtOHzBgq9vzaRU75duA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [172.25.183.122] ([89.1.214.151]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N0XCw-1nTsyM1EqC-00wYs2; Tue, 16 Aug 2022 12:00:10 +0200 Date: Tue, 16 Aug 2022 12:00:11 +0200 (CEST) From: Johannes Schindelin To: phillip.wood@dunelm.org.uk cc: Johannes Schindelin via GitGitGadget , git@vger.kernel.org Subject: Re: [PATCH 4/5] add -p: avoid ambiguous signed/unsigned comparison In-Reply-To: Message-ID: References: <4d24a4345ba66031d2ccf7ce472ed93ace82e9d6.1660143750.git.gitgitgadget@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K1:ZHradS1BjMZ7bYk2wRK4uuozQBWnPphnLe031Xv9jwVxBOk2xy9 OvBOxa9TQRXZ98OrCe7hEP2T+Nxq4DO4jq1wauqVMIQmRq0qqzXxZ8gSN8JoCZgt5/nqjci /RFRDLw9eeCC5yAqmEsluC5bfO7QuoTWYhorIqQEkR3D4NTifvlvprISfhUxrET4SRTy9Zu e9uCIltkN4RRIBWyJYViA== X-UI-Out-Filterresults: notjunk:1;V03:K0:Icuf1wnSOyY=:EUz0Vco7baPZ1PO8blOytD bJ2YkeoFdenrheFOhdWxEjtONpqz8POWpGYlKTU0h9pwsGpqxEeIsm23R6fthgbl5MrAsmsR4 NQzz9WjS+n7CEcB/B1+sSZbXcHb3sNuKHNCirdQ9biaUAQ1wv6Fikptgx2xMBafHpWchZ98H/ EfqUtrK1sbqm/niYMNq/rM2xFXqnqpmhBBhtHbLS1zldMDE3qOi4VYWQ+aHfBQEIkGuXmoaXg 1R3bNW6MN6WUQ3a3GucdCgMmajdfXong13Y1PIocPyjV0aVjYlnjQEHRCaz5b+8Oet9j625/C pXOxZls55168jofL6vz5GFv7PCkI0vqFQfYehZEKwn8Yk5+CIc0jLiFhQmVn0kIp5jDm9rho5 ImOdHfuGhJeXhL7wjKUyrn6PNRNQO9vZxtWEGHmCzTjeb5yCFocNoA1QXPyEBRsruIV0v0H7s dIYsNeRNQ3Rvl4q1wLa6+6Fkhxc2Sy/wgpMlnRtlHm3c30vNiuas03HRwrRCo/JONKXKnGb32 wWstJZ+XGvJr1+rA1SFh8OC6DEwSTe0cvjcmX09xy9t0N4EG1HicoSLD8ObJhfRc8LfUjAeF+ iCIP35oSEVvAtu1fPtjNwecQ4gGHSGS+0JNWhs27VP2j0MJueK5YtP2AMZwJdFhJtthKCkDrr fk543oeRpgZnK6RtVjwYeXPlixSQdaAoBVtzberEvVYJUOsvi3xdbwg86nf22miI0XQ7mMH9u rnHyDc8/WOSrx+sWi+LXo4TAXnlgOYjoFiHW2kr0fbFC4HrrrZYW/RvcQpSyueq5MYRWwEcdP kwKhIpxNkWUgMBeBvAV0ns5Muz3dxwLqoRGkmzAEXuHalgf7rgxRBSpYzgD4M27VMdevnFaHE 9k2NCANkzbWWzKPcRLq/tc/Lctm1fYtUwHFdIlyjpPZthrZ4cyVyjTpOJjN56zL3a/wZZ7JLr +H8AnAVUMj8tffldBJj5vF6FS6q1bo3Y3n967LGWZaokyzJ8xUa5zDlUMF2fcNkyMc6iIEyvu eGhfobKp1YweCchKlT9O9GE/RNxWHJvqPHyWPU20jddMsXlI797smD059VdNq/J9m79mAVu1i ei92EhDsanHd4FX+mM/1astuYoI2axy60wU5S/v/MAwCCps+HqMnBFrjQ== Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Phillip, On Thu, 11 Aug 2022, Phillip Wood wrote: > On 10/08/2022 16:02, Johannes Schindelin via GitGitGadget wrote: > > > diff --git a/add-patch.c b/add-patch.c > > index 509ca04456b..3524555e2b0 100644 > > --- a/add-patch.c > > +++ b/add-patch.c > > @@ -1547,7 +1547,7 @@ soft_increment: > > strbuf_remove(&s->answer, 0, 1); > > strbuf_trim(&s->answer); > > Unrelated to this change but why don't we just call strbuf_reset() here? This part of the code is used when the `g` command (to "go to hunk") was issued by the user. And that `g` command allows for a number to be specified, e.g. `g1` to go to the first hunk. The `strbuf_remove(&s->answer, 0, 1)` removes the `g` from the command. The `strbuf_trim(&s->answer)` allows for whitespace between the `g` and the number, e.g. `g 1` should also go to the first hunk. If we called `strbuf_reset()` here, we would remove the number completely. Ciao, Dscho