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=-3.7 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_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 E91B11F953 for ; Mon, 3 Jan 2022 15:20:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233880AbiACPU0 (ORCPT ); Mon, 3 Jan 2022 10:20:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229995AbiACPU0 (ORCPT ); Mon, 3 Jan 2022 10:20:26 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDA0DC061761 for ; Mon, 3 Jan 2022 07:20:25 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id k18so33808191wrg.11 for ; Mon, 03 Jan 2022 07:20:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=MLCWkVOIU88dF5AjOgj4irLRBITh8K3hvedUwiZ/AR4=; b=k98eS09AB6i5+QTwyakeB8dbebgomkOPILB4AueubtWTXGIhxnI4+mm+etvjr0cwyK D+Fd9Ujhk66W1sojCsyvQoqk6LB+iHSad5wyRGWGX54lZqSNAlMrSGyh6B4rcxbIzZ78 tiKRQ8nHhr64YQgKcJJtmWrWN59mPOUa97NbDhC02hCwq5MmAvRE5e1CArgPkQwRRJGg DiTMOdeRk0YWs1ipHkPaJrDTz0ZSgudFw5yG+qSU+aZdQ1maKibovWu+mujhsfgXGpJ6 sRqKEK0EWvDCl9wNyPambYUiOXyJK0oM3YGx8g/WB8wLwp8tGPNQ9tFrqJtZDng/PO+V OP9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=MLCWkVOIU88dF5AjOgj4irLRBITh8K3hvedUwiZ/AR4=; b=fwBeIq8QQmHK8sQsSduUP7aTdjZgcOq8SbzdbMK6iUsh2WPVmoBW8JYk8j0H4K1qp1 NwEcAWqNqYhlCP45eHEeBjckT/4KU+LfLmN/iGt2CULdCGFlKQ1uJKkNbksZjlims0dP QZNDAVp8eUOTtzJXwWoKcp496HpSGJX59HZYN2Dfui1ozUd127taLNvQE/SZb51UccX6 0CA4hxldW0TSK0/lICRpUM77qrw8uK+9W9PUSo/5ZXdlVVpl8sQDmQ04oolM0EWuasOS a8vvraxiAwWwwDERx0TXNvYj1dUQ8sHHU87LX/Nn1ifNa0C2Cs7UUxQvEaDBmkBjk2KO O3sw== X-Gm-Message-State: AOAM531Hh8A8LXlYFtQnhtzH3qrzFuLxgqmcWVAxugDkLc+GWOkoS+IF 7Tmzc3t3PQkrbgv8rnvvGq+GsEWxXkk= X-Google-Smtp-Source: ABdhPJzJMB12e2JjlfmmT/zIh+dcygxzNYRpgWKUKMCk5orN4PR/de+Q8+/iyjDxydivAEpVv5vnug== X-Received: by 2002:adf:d1cc:: with SMTP id b12mr41467005wrd.282.1641223224104; Mon, 03 Jan 2022 07:20:24 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g5sm39035930wrd.100.2022.01.03.07.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 07:20:23 -0800 (PST) Message-Id: In-Reply-To: References: From: "John Cai via GitGitGadget" Date: Mon, 03 Jan 2022 15:20:20 +0000 Subject: [PATCH v2 0/2] reflog.c: switch to use parse-options API Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?UTF-8?Q?Ren=C3=A9?= Scharfe , John Cai Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Switch out manual argv parsing for the reflog expire subcommand to use the parse-options API. This reduces code redundancy by consolidating option parsing logic. changes since v1: * add helper parse_opt_expiry_date so we can use this shared logic to parse the expire date option. * place explicit_expiry inside of cmd_reflog_expire_cb to make it easier to use a callback to set both the value of the timestamp and the explicit_expiry flag. John Cai (2): parse-options.h: add parse_opt_expiry_date helper builtin/reflog.c: switch to use parse-options API for delete subcommand builtin/reflog.c | 168 +++++++++++++++++++++++---------------------- parse-options-cb.c | 7 +- parse-options.h | 1 + 3 files changed, 94 insertions(+), 82 deletions(-) base-commit: 55b058a8bbcc54bd93c733035c995abc7967e539 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1175%2Fjohn-cai%2Fjc%2Freflog-switch-to-option-parse-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1175/john-cai/jc/reflog-switch-to-option-parse-v2 Pull-Request: https://github.com/git/git/pull/1175 Range-diff vs v1: 1: 9bd3c6672c4 < -: ----------- builtin/reflog.c: use parse-options for expire subcommand -: ----------- > 1: bcd74559c24 parse-options.h: add parse_opt_expiry_date helper 2: fffea298642 ! 2: f9de21e0f26 builtin/reflog.c: switch to use parse-options API for delete subcommand @@ Commit message Address NEEDSWORK by switching out manual arg parsing for the parse-options API for the delete subcommand. + Moves explicit_expiry flag into cmd_reflog_expire_cb struct so a + callback can set both the value of the expiration as well as the + explicit_expiry flag. + Signed-off-by: "John Cai" ## builtin/reflog.c ## @@ - #include "revision.h" #include "reachable.h" #include "worktree.h" --#include "parse-options.h" +-/* NEEDSWORK: switch to using parse_options */ +-static const char reflog_expire_usage[] = +-N_("git reflog expire [--expire=