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=-2.9 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,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 6E7861F452 for ; Sat, 1 Apr 2023 19:33:08 +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=egp++1yc; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229603AbjDATdH (ORCPT ); Sat, 1 Apr 2023 15:33:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229469AbjDATdG (ORCPT ); Sat, 1 Apr 2023 15:33:06 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAC1B1A963 for ; Sat, 1 Apr 2023 12:33:01 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id g17so33143533lfv.4 for ; Sat, 01 Apr 2023 12:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680377580; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=GY+cRzmkgg46yk/5enO7jC6HgeeXaHDe4oJCp7I1keU=; b=egp++1ycIbezeyCQif7GBqYf8ghFRmD2SpnMYSBJmvXryeT+kiR8pOb6XafWff6ov9 bFU8t5Xqh7/atYUBZDWqHbJ4RUxNlgIoF8CgTdDUJQpxQPK+VLGVw5Bu9LRJRxPr4fmZ Qk3k+xpBTKupjtfrru/fNb7pZ1PxGu+JT5zTNImqbOvdEJ/WAyy5NdN7fNxzuzaJsmJD /1xpIuN3mwTtISu1PHkEqS41Hg/rsWI2/bAUZZtMBiBJLyfsqY/mNMGxIMcpVKaTyE7v Z0cL1bEu2E1iIretI9HWX8iPwcl1obvm/oAChtZy6r3h2fL+ndVrfVAa4UfHyxmw8FWw ySRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680377580; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GY+cRzmkgg46yk/5enO7jC6HgeeXaHDe4oJCp7I1keU=; b=vpFMRHas9IRnC0MdY49mbmv+8He9IOcGJx+davRvHu3MFJZ4Rqpn8jMMtQWxBqmfiG JTHkYehW0bU27vqSb9sbGY930Vjzz6DgVMMjoQeJMvF9y04wWiSGSE4QhuT3y0f91PSe DNYs9yOxPKmqikrGQxbIvTJylmPBMPR89/rwHvyVl4zV8Ksqztjn6LBMjhTfPfYig0oz ZTeVERnvBdf7ySLoQHbh2AoQSYHGwupyMhSfBbptgZUWe73Y3JH7nBc3AO1IJlq3kHzP gAWxL8jeqEZEX1iLCF24T3+Z8uOp4diKZWQ4up+zAXATn74YOJwzNMNWB/AdlxqiR4C/ Fc2A== X-Gm-Message-State: AAQBX9cyjjecGm6nL6c51PPCyju6K04LjKaN/i8gdFKg3HZ++ndcTfkx dW6IswmOpriYDwXxaeXwU8e6bjj5HSWHcaqKe/pvq32v X-Google-Smtp-Source: AKy350b+/wS4eEX+AklFzULByaZfjEGaGspethwduhBPtowglwLtbAccQC1QoRGmt3xTFOdYd4QM8oitYvigXxg3eg8= X-Received: by 2002:ac2:596a:0:b0:4e8:6261:58c2 with SMTP id h10-20020ac2596a000000b004e8626158c2mr8964430lfp.7.1680377580154; Sat, 01 Apr 2023 12:33:00 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Elijah Newren Date: Sat, 1 Apr 2023 12:32:48 -0700 Message-ID: Subject: Re: [PATCH 0/4] rebase: cleanup merge strategy option handling To: Phillip Wood Cc: git@vger.kernel.org, =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Mar 15, 2023 at 8:39=E2=80=AFAM Phillip Wood wrote: > > From: Phillip Wood > > Cleanup the handling of --strategy-option now that we no longer need > to support "--preserve-merges" and properly quote the argument when > saving it to disc. Nice! Thanks for taking the time to do these kinds of cleanups. Overall the code looks pretty good, but I left a few comments/questions on patches 3 & 4.