From patchwork Mon Aug 31 10:50:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 11746159 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 70CC613A4 for ; Mon, 31 Aug 2020 10:52:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 57B90206F0 for ; Mon, 31 Aug 2020 10:52:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Eg12/VnB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727802AbgHaKwb (ORCPT ); Mon, 31 Aug 2020 06:52:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727115AbgHaKvV (ORCPT ); Mon, 31 Aug 2020 06:51:21 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B16BC06123A for ; Mon, 31 Aug 2020 03:51:21 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id e11so2027454wme.0 for ; Mon, 31 Aug 2020 03:51:21 -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=mjlcmqDkoBU4zYuVyCyhpOVtSC+VbYEAFixsbaU2PfY=; b=Eg12/VnBaIfd47QhdmPqm46t9lzrT3ePolXlue1a8zEosNPog/MGOcPZjpP30D/UYS EThYeW4wYS/98TkS8zAWpy4rI+OblxsTx5vzMMsXdnVUJTDpISR38gUE2Kpm+olqdv99 KtLadryHtutfU7oqmy7KG63YYNeJr3xmoab30WSpYKCASF0OaCnK5kzG8D6EsyAOBsec JXbIsey2nDpcc357mbX+4cLFqAs4Dv8yuIUjexwI2KlLHKlcIf7SpzD+JxGN0s9iIoD+ XxxcUXQSkTu6mHsEd+2oxu6xmP3AzbqA63sVUtxJ8ZEVMRxG+8FdMQYV8+RvPlPZK4Z5 rLbA== 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=mjlcmqDkoBU4zYuVyCyhpOVtSC+VbYEAFixsbaU2PfY=; b=s1WLcNkGKpMuIna845F/8Fmn6ixUMWYw0e4rvvwhgb5++F/ayU5z1XevFUIapn1aNl e8xFevKvNYEDkt8WkW2sdGXArKQyBy4wzqeUIOtkQ2UWw0yty/gekrAkn7+c4XjxWhQW 5fOecfHFz8AiPRVzLte29PlN8/cFhNKP28dy88kSVRb/Su2APWs0leD+KTcAiXRYoq3W HKy9bitF0x8AIP3vAeV/pB83Qm3fFsrAmD5fMuPAhxLrEq0vDIchvhr0bQuxrxI5QGEv UMGCxC88s+Oo6KXrua1WTNG3u/PG5ljV+hKF7P7AvmGiACBDZ6Xo7kLyweUTZQjH2Nss VxEA== X-Gm-Message-State: AOAM533i3E7uc/3GWHi0A+iI9IYsElaMsMRuqw29vDCj1PdzarGDv0uz fJrPjvJB9lSxbAQlVJbqsCQIFYfl6Vk= X-Google-Smtp-Source: ABdhPJwr4I/NSnmr/S/udodXNmxzCqGR6+hn3wlwpD8M/Z9d1oADDpkrKzqeMsSh/cNYSEdU10feZg== X-Received: by 2002:a05:600c:2cc1:: with SMTP id l1mr826534wmc.78.1598871079626; Mon, 31 Aug 2020 03:51:19 -0700 (PDT) Received: from localhost.localdomain ([178.237.236.228]) by smtp.gmail.com with ESMTPSA id k84sm7674454wmf.6.2020.08.31.03.51.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Aug 2020 03:51:18 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Pranit Bauva , Lars Schneider , Christian Couder , Tanushree Tumane , Miriam Rubio Subject: [PATCH v7 09/13] bisect--helper: retire `--next-all` subcommand Date: Mon, 31 Aug 2020 12:50:39 +0200 Message-Id: <20200831105043.97665-10-mirucam@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200831105043.97665-1-mirucam@gmail.com> References: <20200831105043.97665-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 `--next-all` subcommand is no longer used from the git-bisect.sh shell script. Instead the function `bisect_next_all()` is called from the C implementation of `bisect_next()`. Mentored-by: Lars Schneider Mentored-by: Christian Couder Signed-off-by: Pranit Bauva Signed-off-by: Tanushree Tumane Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index b8b8a7473c..0796e51672 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -20,7 +20,6 @@ static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES") static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT") static const char * const git_bisect_helper_usage[] = { - N_("git bisect--helper --next-all"), N_("git bisect--helper --write-terms "), N_("git bisect--helper --bisect-reset []"), N_("git bisect--helper --bisect-write [--no-log] "), @@ -866,8 +865,7 @@ static int bisect_autostart(struct bisect_terms *terms) int cmd_bisect__helper(int argc, const char **argv, const char *prefix) { enum { - NEXT_ALL = 1, - WRITE_TERMS, + WRITE_TERMS = 1, CHECK_EXPECTED_REVS, BISECT_RESET, BISECT_WRITE, @@ -881,8 +879,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) } cmdmode = 0; int res = 0, nolog = 0; struct option options[] = { - OPT_CMDMODE(0, "next-all", &cmdmode, - N_("perform 'git bisect next'"), NEXT_ALL), OPT_CMDMODE(0, "write-terms", &cmdmode, N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS), OPT_CMDMODE(0, "check-expected-revs", &cmdmode, @@ -919,9 +915,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) usage_with_options(git_bisect_helper_usage, options); switch (cmdmode) { - case NEXT_ALL: - res = bisect_next_all(the_repository, prefix); - break; case WRITE_TERMS: if (argc != 2) return error(_("--write-terms requires two arguments"));