From patchwork Sat Mar 21 16:10:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 11451235 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6C55A139A for ; Sat, 21 Mar 2020 16:14:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C41B20781 for ; Sat, 21 Mar 2020 16:14:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H7BvfG/T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727700AbgCUQOF (ORCPT ); Sat, 21 Mar 2020 12:14:05 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:43121 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727664AbgCUQOD (ORCPT ); Sat, 21 Mar 2020 12:14:03 -0400 Received: by mail-wr1-f65.google.com with SMTP id b2so11184769wrj.10 for ; Sat, 21 Mar 2020 09:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=twYGXXJepqFNADUAJI94HOwQKJkYuQPF9Hhrv9JgPBk=; b=H7BvfG/TyEtR1J6zCDMfC9Avv6f/keljGJuT314GkR0S1bFTqMT0sWFIZGAi8vROhg /8OP5tYt4QTBZvboi98HVYyTr+LaqVYonO010SPLDqip/l2mdihAuEn31Id1+Td8iUJK cOhRmbrIpc02YuIt2Mei7djiZganCzppskXzZ47vkUNRyuIUXtuJYDxNazKlg0Pm0Fbq dYP3lhx48k/N/esmAZMHUzg4BjC5T+fQ8+se/ELVBXFBB567dgCDufmc5CYnEEcizxJn w+q/mvj13ewjXhZXhXdLCihJqEJubIW+Mi1U2YJhSpeHwpeGv0fGgpRFw0BOUTFhfCAX 8IWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=twYGXXJepqFNADUAJI94HOwQKJkYuQPF9Hhrv9JgPBk=; b=RoYd0Kr+Z/eRShgXKRRchYcEHXPmm6QzArCbeGYmV7Mew74c0jqvqqU290sDGduX/o QFB6zaG6KAq4C2aNsuwvUjdZNz5VKQG9U56Ydie2yikJlBri9n/OxR2DO2RUXSv+iN9/ feKfOXJnlunRsPllF6Q/02BB7mS+wxoSxwlhBiQJdfct4+mpNs4KTJwCbicAMhuBJgcH APWmIipdvSnnB9vCMx+XinoGHcdd5RFc7IBCtngxULYwIlQPA3XGQzftaTd84BQGRCDv +/JQAYQL1HPqDuh30JAwfs0eRFMYMEuk+m1QnGUrFN/H8JdUtuTm7otsvp26DzopyF4s gxRg== X-Gm-Message-State: ANhLgQ3XK2hBvn+pUIzSvaJwodqz1BnK/In4wVO8T1ol1hii7qzlGOTx 6xQISjVCHEfwh+b2gHaf3h1BRxlhKi0= X-Google-Smtp-Source: ADFU+vvY6ETii5/tXsppc++MvcoENENuUHqCPogWFNKJJUvU8GmAeASe1niHz6Pg9I/Y/MmiW2VHDQ== X-Received: by 2002:adf:a285:: with SMTP id s5mr19081410wra.118.1584807241725; Sat, 21 Mar 2020 09:14:01 -0700 (PDT) Received: from localhost.localdomain ([139.47.115.4]) by smtp.gmail.com with ESMTPSA id f22sm13992285wmf.2.2020.03.21.09.14.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 09:14:01 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Pranit Bauva , Lars Schneider , Christian Couder , Johannes Schindelin , Tanushree Tumane , Miriam Rubio Subject: [PATCH v2 10/11] bisect--helper: retire `--write-terms` subcommand Date: Sat, 21 Mar 2020 17:10:19 +0100 Message-Id: <20200321161020.22817-11-mirucam@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200321161020.22817-1-mirucam@gmail.com> References: <20200321161020.22817-1-mirucam@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Pranit Bauva The `--write-terms` subcommand is no longer used from the git-bisect.sh shell script. Instead the function `write_terms()` is called from the C implementation of `set_terms()` and `bisect_start()`. Mentored-by: Lars Schneider Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Pranit Bauva Signed-off-by: Tanushree Tumane Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 2b1d918497..8fdefb611b 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -20,7 +20,6 @@ static GIT_PATH_FUNC(git_path_head_name, "head-name") static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES") static const char * const git_bisect_helper_usage[] = { - N_("git bisect--helper --write-terms "), N_("git bisect--helper --bisect-reset []"), N_("git bisect--helper --bisect-write [--no-log] "), N_("git bisect--helper --bisect-check-and-set-terms "), @@ -895,8 +894,7 @@ static enum bisect_error bisect_state(struct bisect_terms *terms, const char **a int cmd_bisect__helper(int argc, const char **argv, const char *prefix) { enum { - WRITE_TERMS = 1, - BISECT_RESET, + BISECT_RESET = 1, BISECT_WRITE, CHECK_AND_SET_TERMS, BISECT_NEXT_CHECK, @@ -909,8 +907,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) } cmdmode = 0; int no_checkout = 0, res = 0, nolog = 0; struct option options[] = { - OPT_CMDMODE(0, "write-terms", &cmdmode, - N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS), OPT_CMDMODE(0, "bisect-reset", &cmdmode, N_("reset the bisection state"), BISECT_RESET), OPT_CMDMODE(0, "bisect-write", &cmdmode, @@ -947,10 +943,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) usage_with_options(git_bisect_helper_usage, options); switch (cmdmode) { - case WRITE_TERMS: - if (argc != 2) - return error(_("--write-terms requires two arguments")); - return write_terms(argv[0], argv[1]); case BISECT_RESET: if (argc > 1) return error(_("--bisect-reset requires either no argument or a commit"));