From patchwork Fri Aug 20 17:21:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12450061 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28881C4338F for ; Fri, 20 Aug 2021 17:23:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ECF0361101 for ; Fri, 20 Aug 2021 17:23:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233405AbhHTRXl (ORCPT ); Fri, 20 Aug 2021 13:23:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232598AbhHTRXi (ORCPT ); Fri, 20 Aug 2021 13:23:38 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82612C061756 for ; Fri, 20 Aug 2021 10:23:00 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id c8-20020a7bc008000000b002e6e462e95fso9594326wmb.2 for ; Fri, 20 Aug 2021 10:23:00 -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=TDf4NR7irMIBPs6yfFlCt71FkrZC3JHtpdJMSAhYZAI=; b=B8cIWgm/brrnLHhkHzvqjDSFmpaL6aUVHNb2v1nsJta5qhNaTYlN2tD6MhAH2nR+ad IrayQcswZNRAfx5GYMuBgqiDUQS5c+Hz5IdBZDcEPOl52oWmMGP4cwCgqfzOWZNXU7mh OYFp5moHsV8JH/vAhbhUi4tE15xa4akKzivocqPOwSZMMgxfJn8SlURY4PD5444u7End 7RMSUb3XOFeKL4t9+eeIeyW7YgVdVe42VGKrvuOfwZXfRrDZCfCuuxHdckYZLNX5gw5b Q+iNVeqZT5YV+mW8hTXZjOL1lw1MfksPxSIs0kkjiZWxvOfTElykqAFcAcrn0aagB0zK /94w== 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=TDf4NR7irMIBPs6yfFlCt71FkrZC3JHtpdJMSAhYZAI=; b=cjCPRKqm+YYV0ZzWB3l6ZAaczpFg6BVHGuqeYQCrM5Zo8cHzKZlTsmHJQTweBEuJVv x3FBL9+7Xcyt90RHovj74OWawloOZaejigxmTPDtkYyxMgaKXeoZvOfxVUO7QOXBh05a dYaV7axEb774RxRDUHRdlU6K0v5Mtj4TookaphTDO/x4V+sHEUwRbozDwRFCBrgoawH8 ek9HEmovHnaD/H/Nn/YOKasLFLt/6yv4qoJBvIuiBnd+54sBMGdRCgU8B4rJjOUVYjzH 3VsrzhKpTRiRPal6U4pDX3XMOdAQvBLQZC0D2e+Ph06t/7c3gnIWjWOHhscT9MHmIDTp XPEA== X-Gm-Message-State: AOAM53232T5HUJKBb0HZuUDh98jRKsk2LaaywEX47qnWTkcm+bqQUwhi DeXXobGrBs/taaKdNfiNOg8Jb9VnG2I= X-Google-Smtp-Source: ABdhPJyaiVHhHzO/M+BOJ2YDbG3v8zg7V+Td6eG7rSdCfLNr3WKC+fvBsBrUyZfvwZgVqh0mjSE72w== X-Received: by 2002:a7b:c188:: with SMTP id y8mr5041209wmi.174.1629480179118; Fri, 20 Aug 2021 10:22:59 -0700 (PDT) Received: from localhost.localdomain ([178.237.232.111]) by smtp.gmail.com with ESMTPSA id x13sm6623278wrq.44.2021.08.20.10.22.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Aug 2021 10:22:58 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio Subject: [PATCH v5 1/6] t6030-bisect-porcelain: add tests to control bisect run exit cases Date: Fri, 20 Aug 2021 19:21:43 +0200 Message-Id: <20210820172148.2249-2-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210820172148.2249-1-mirucam@gmail.com> References: <20210820172148.2249-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There is a gap on bisect run test coverage related with error exits. Add two tests to control these error cases. Signed-off-by: Miriam Rubio --- t/t6030-bisect-porcelain.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index a1baf4e451..e61b8143fd 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -962,4 +962,15 @@ test_expect_success 'bisect handles annotated tags' ' grep "$bad is the first bad commit" output ' +test_expect_success 'bisect run fails with exit code equals or greater than 128' ' + write_script test_script.sh <<-\EOF && + exit 128 >/dev/null + EOF + test_must_fail git bisect run ./test_script.sh > my_bisect_log.txt && + write_script test_script.sh <<-\EOF && + exit 255 >/dev/null + EOF + test_must_fail git bisect run ./test_script.sh >> my_bisect_log.txt +' + test_done From patchwork Fri Aug 20 17:21:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12450065 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEB52C432BE for ; Fri, 20 Aug 2021 17:23:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C32FD6115A for ; Fri, 20 Aug 2021 17:23:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233743AbhHTRXm (ORCPT ); Fri, 20 Aug 2021 13:23:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233006AbhHTRXj (ORCPT ); Fri, 20 Aug 2021 13:23:39 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37401C061757 for ; Fri, 20 Aug 2021 10:23:01 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id f5so15206715wrm.13 for ; Fri, 20 Aug 2021 10:23:01 -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=hPiI6iYTFA/a2PMpNddc4bK5XRP/g0IXABNMsrGR6dE=; b=r56DX6cjDuSy6IrAFjUvi1nw2B//0blyVydlzVsF5SfwCEJ9u4BQOhmiyrVJiOooDb edaKtMSE6ATOhck5B4ADuSu++MijP+APZbhoKrnQqODoaZycGBZ8wAC/MAXE9zb1HQfj gv/WLiwUfnV9OEwI6mQd7CuiUkukGcpHzq6SjdGhQy8vWSMV12AmXidOzBx5qaZv5zpK YBF3EQGX+Jywe4Omd7oV86F5vOAuTmITeTfwyqVro8P8Wmu+Q/FIv8LhGVxAlN16acB9 Ae5EoHKHhsnDLrC9wqB3dokFzrIDDHZDTTpzEDtgTTQ6i1jg7orTfAcv5EVIIfUDG7Hc uEAw== 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=hPiI6iYTFA/a2PMpNddc4bK5XRP/g0IXABNMsrGR6dE=; b=FQNBX1ZpOTHqqxi60bZYfC+pXdwHIB5d7UcoeLp2kUwr1d5pKLA6cf0dY7GIqHFFje 3xibcKnf8Zjqqj9ZF5A5q+fXtwvFAlGgenb4zoBHMthWdvZ0eTBvfp9IyPiGaRHMHphF +j2t1hy+BUxrWF2gUh/57LAIFYm/WFWunDWSBOpear/0yagPMcQcBMsChqQkF0oEbGxF bcAiXphnaQqKMWIiEQt2OIIiQXSpFEZH0TrpP36KFaZOHdt3NARZmVEi93Em2oQETXH1 xaR1k8EqjwKhwtDRTbsyGbxbDMr7d2yeY/rnFV0AkJxq8GXuhMpzyUMxa/jg75077zXm pquA== X-Gm-Message-State: AOAM530VfEHmjTpmmAhvVFu7UPw1gK0b6BYCmUZH5NfQyPMVeD85WI/R jXxlzfubbfAqZZtIUKhi+hJvlVod/oI= X-Google-Smtp-Source: ABdhPJwXuDISKge9twt4UtJ0qoQRGoJyI+aQi13nCo/13Ryoar+f60oWiB11In6DzSIYlVoAYKcB/Q== X-Received: by 2002:a5d:6991:: with SMTP id g17mr11662830wru.253.1629480179831; Fri, 20 Aug 2021 10:22:59 -0700 (PDT) Received: from localhost.localdomain ([178.237.232.111]) by smtp.gmail.com with ESMTPSA id x13sm6623278wrq.44.2021.08.20.10.22.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Aug 2021 10:22:59 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio Subject: [PATCH v5 2/6] t6030-bisect-porcelain: add test for bisect visualize Date: Fri, 20 Aug 2021 19:21:44 +0200 Message-Id: <20210820172148.2249-3-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210820172148.2249-1-mirucam@gmail.com> References: <20210820172148.2249-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add a test to control breakages in bisect visualize command. Signed-off-by: Miriam Rubio --- t/t6030-bisect-porcelain.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index e61b8143fd..f13eeac9ce 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -973,4 +973,11 @@ test_expect_success 'bisect run fails with exit code equals or greater than 128' test_must_fail git bisect run ./test_script.sh >> my_bisect_log.txt ' +test_expect_success 'bisect visualize with a filename with dash and space' ' + echo "My test line" >> -hello\ 2 && + git add -- -hello\ 2 && + git commit --quiet -m "Add test line" -- -hello\ 2 && + git bisect visualize -p -- -hello\ 2 > my_bisect_log.txt +' + test_done From patchwork Fri Aug 20 17:21:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12450067 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89B20C4338F for ; Fri, 20 Aug 2021 17:23:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 719B76115A for ; Fri, 20 Aug 2021 17:23:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233801AbhHTRXn (ORCPT ); Fri, 20 Aug 2021 13:23:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233544AbhHTRXk (ORCPT ); Fri, 20 Aug 2021 13:23:40 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08A2DC061575 for ; Fri, 20 Aug 2021 10:23:02 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id r7so15357692wrs.0 for ; Fri, 20 Aug 2021 10:23:01 -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=ff1IbLdcvpD6MhimWYyxaTfLrj9k2S7N5XzYOYFduTA=; b=BUGcktnaiAOkd7mdLe2/K9U/I3Ugu0+fbQU8Yuyp7sqmujKbvYsAzhGESHeohzrXxs QiHHrxnP++l7a8hvj4G6ZjqS36FfTikyaWTAdPdwWFZCAyf8kEA9lld5NgqjE50CjWGU 27hU3oRUxhliykDh75IjFJED0Gx6yaEEf4Bacl4oanwRuRnL+aURaRqzlucQQv32XR4s VSN2JCFfGooWBfdVGCj0xov6VpA6QXlxBsD9m+f/HoUF6JI/iVRZoHP6VSD4F80AqUsk +A/0gzxzjbbXfrFQF7PB5aHUizP0lGCyU4OkKW/Ek50X5/iB04yzSt+yktVCIUBsC/Yh yuOQ== 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=ff1IbLdcvpD6MhimWYyxaTfLrj9k2S7N5XzYOYFduTA=; b=jsg2vb9f1Nr7AnLpgq4VCQeBeB6Ej35P0DrK328j2CQyYSt3oVsCUSO+UUPOuIU0og L4bQlpKI/JPg7DGtnyNrHcv1hcYrnA573T6PQzc84+3INpnd123gjKUYh2mOZ1J/brWh rATjpSFM/FK7qW8VKewBHLAyhAnXKmwR428lRsDD7JEwZEVN6MZWiqqmoHaiT3a64yBf DwlEv3CPhM0Q+Ioch7Q3Hd36oCgtOaH5eapZv99BPAceh6ueq7/3eGvor+5uRrNDXgGB dpuoM8Y5/jEGquskMJhi07ESg03OSXT2hYtZmaHSLU9WGjPD8Tncep9wzGCIFXsCH1JJ hVCg== X-Gm-Message-State: AOAM533cx+r1dHaR6SDc9VisrFHf9l41YEE/JGo77+fTlp5F1AbfMTai XXVcnXTJr90VopbBkJk/qGZUthgmHR8= X-Google-Smtp-Source: ABdhPJyIJYhc1XKZ7k2q73YIoMQPpUhk3aqgnw0tpHjsYeI4lkCL3IWgisuP8qm3RLOAwOFaUoXQHA== X-Received: by 2002:a5d:44c6:: with SMTP id z6mr9845645wrr.58.1629480180649; Fri, 20 Aug 2021 10:23:00 -0700 (PDT) Received: from localhost.localdomain ([178.237.232.111]) by smtp.gmail.com with ESMTPSA id x13sm6623278wrq.44.2021.08.20.10.22.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Aug 2021 10:23:00 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Pranit Bauva , Tanushree Tumane , Miriam Rubio Subject: [PATCH v5 3/6] run-command: make `exists_in_PATH()` non-static Date: Fri, 20 Aug 2021 19:21:45 +0200 Message-Id: <20210820172148.2249-4-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210820172148.2249-1-mirucam@gmail.com> References: <20210820172148.2249-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Pranit Bauva Removes the `static` keyword from `exists_in_PATH()` function and declares the function in `run-command.h` file. The function will be used in bisect_visualize() in a later commit. Mentored by: Christian Couder Mentored by: Johannes Schindelin Signed-off-by: Tanushree Tumane Signed-off-by: Miriam Rubio --- run-command.c | 2 +- run-command.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/run-command.c b/run-command.c index f72e72cce7..390f46819f 100644 --- a/run-command.c +++ b/run-command.c @@ -210,7 +210,7 @@ static char *locate_in_PATH(const char *file) return NULL; } -static int exists_in_PATH(const char *file) +int exists_in_PATH(const char *file) { char *r = locate_in_PATH(file); int found = r != NULL; diff --git a/run-command.h b/run-command.h index af1296769f..54d74b706f 100644 --- a/run-command.h +++ b/run-command.h @@ -182,6 +182,18 @@ void child_process_clear(struct child_process *); int is_executable(const char *name); +/** + * Search if a $PATH for a command exists. This emulates the path search that + * execvp would perform, without actually executing the command so it + * can be used before fork() to prepare to run a command using + * execve() or after execvp() to diagnose why it failed. + * + * The caller should ensure that file contains no directory separators. + * + * Returns 1 if it is found in $PATH or 0 if the command could not be found. + */ +int exists_in_PATH(const char *file); + /** * Start a sub-process. Takes a pointer to a `struct child_process` * that specifies the details and returns pipe FDs (if requested). From patchwork Fri Aug 20 17:21:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12450069 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E689C4338F for ; Fri, 20 Aug 2021 17:23:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44E0261101 for ; Fri, 20 Aug 2021 17:23:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234045AbhHTRXq (ORCPT ); Fri, 20 Aug 2021 13:23:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233563AbhHTRXl (ORCPT ); Fri, 20 Aug 2021 13:23:41 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8980C061756 for ; Fri, 20 Aug 2021 10:23:02 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id v10so4027579wrd.4 for ; Fri, 20 Aug 2021 10:23: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=Ktl74k5Q2uTlQ9/SeSsFyS8i0Yj60tIMh0mbF+xmXEw=; b=kV6PWBbTEgOujU5c1UsSWsg78j0wGrBw1gCNk/dAO01XRungIXLa4zwNcSTmbswZuK DHm+Z7ZD5Cu+2pq7NuMSprb88CJHh8MwW5Ic5rzgaTgSrhm5ryICWF2zRTE4+thiC/Nv WEVoalaxRZZwK/wrMhfVqEe3ptvreLWz3LCIy+x9+20Ewm3F8qJ1KyrM0RtD3NjvetW2 z4v38tXRY2W/ZIKZEl0DusWHpTwlVWtBhTullNhiPpxX3Cxys//wea+LftuwhHzMncIk r2CdvVGkciVgqYIIy1+ZJ2GKLBtCNtQbvx/oJL9T3bZzYruDHReQLsW+eJeA7o91nmT4 Gxrw== 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=Ktl74k5Q2uTlQ9/SeSsFyS8i0Yj60tIMh0mbF+xmXEw=; b=alsistwDRoA/mbieJ1/54ubb0QEsy4zCWHUeWB2cYu9GCjDfRyi3HS36u8wJsODNcD JOUSNis09CY6Xbe1Kb7eqkI/WOWCJqD5BhClREo8UXCd66iShV1MJjrdDhUB4uIJ9Bn3 QUNnHyhGwo3dL0AYhLg2+x6In7XIYFG4rk5ZvHqknpxTDOKQeB2//5KCWrSGExpsGW4I nJqGmD9ktlmcUkyAepQAqQAbZ1dEsQg6sx7qX+HDNoy/ayp+zY5HFYGqmr6aYILKNGk3 PQ4+Pl0I0nvz2HeimavUIc2Pt4Udd3+Gzt4v+aT5bzxhyBnA8/s2R6i3zjDYmXxCucnk S16A== X-Gm-Message-State: AOAM533Hbe/67UM/FdjIqJmx2lB+3MD4JAb41SudnBtFqGb/yVQGv319 EF3sy5Uy7C8mB8NumI9Z526CEs7dRTE= X-Google-Smtp-Source: ABdhPJxdHrZ6JgbhiQ3ZFHPRCLyMiivoZ68+eNueoSkyt5COMlBq+MC9rsXwc2FTEIdaTehNlNi53A== X-Received: by 2002:adf:a1ca:: with SMTP id v10mr11198612wrv.177.1629480181509; Fri, 20 Aug 2021 10:23:01 -0700 (PDT) Received: from localhost.localdomain ([178.237.232.111]) by smtp.gmail.com with ESMTPSA id x13sm6623278wrq.44.2021.08.20.10.23.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Aug 2021 10:23:01 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Pranit Bauva , Christian Couder , Johannes Schindelin , Tanushree Tumane , Miriam Rubio Subject: [PATCH v5 4/6] bisect--helper: reimplement `bisect_visualize()`shell function in C Date: Fri, 20 Aug 2021 19:21:46 +0200 Message-Id: <20210820172148.2249-5-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210820172148.2249-1-mirucam@gmail.com> References: <20210820172148.2249-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Pranit Bauva Reimplement the `bisect_visualize()` shell function in C and also add `--bisect-visualize` subcommand to `git bisect--helper` to call it from git-bisect.sh. Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Tanushree Tumane Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 48 +++++++++++++++++++++++++++++++++++++++- git-bisect.sh | 25 +-------------------- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index f184eaeac6..1e118a966a 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -30,6 +30,7 @@ static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-state (good|old) [...]"), N_("git bisect--helper --bisect-replay "), N_("git bisect--helper --bisect-skip [(|)...]"), + N_("git bisect--helper --bisect-visualize"), NULL }; @@ -1036,6 +1037,44 @@ static enum bisect_error bisect_skip(struct bisect_terms *terms, const char **ar return res; } +static int bisect_visualize(struct bisect_terms *terms, const char **argv, int argc) +{ + struct strvec args = STRVEC_INIT; + int flags = RUN_COMMAND_NO_STDIN, res = 0; + struct strbuf sb = STRBUF_INIT; + + if (bisect_next_check(terms, NULL) != 0) + return BISECT_FAILED; + + if (!argc) { + if ((getenv("DISPLAY") || getenv("SESSIONNAME") || getenv("MSYSTEM") || + getenv("SECURITYSESSIONID")) && exists_in_PATH("gitk")) + strvec_push(&args, "gitk"); + else { + strvec_push(&args, "log"); + flags |= RUN_GIT_CMD; + } + } else { + if (argv[0][0] == '-') { + strvec_push(&args, "log"); + flags |= RUN_GIT_CMD; + } else if (strcmp(argv[0], "tig") && !starts_with(argv[0], "git")) + flags |= RUN_GIT_CMD; + + strvec_pushv(&args, argv); + } + + strvec_pushl(&args, "--bisect", "--", NULL); + + strbuf_read_file(&sb, git_path_bisect_names(), 0); + sq_dequote_to_strvec(sb.buf, &args); + strbuf_release(&sb); + + res = run_command_v_opt(args.v, flags); + strvec_clear(&args); + return res; +} + int cmd_bisect__helper(int argc, const char **argv, const char *prefix) { enum { @@ -1048,7 +1087,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) BISECT_STATE, BISECT_LOG, BISECT_REPLAY, - BISECT_SKIP + BISECT_SKIP, + BISECT_VISUALIZE, } cmdmode = 0; int res = 0, nolog = 0; struct option options[] = { @@ -1070,6 +1110,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) N_("replay the bisection process from the given file"), BISECT_REPLAY), OPT_CMDMODE(0, "bisect-skip", &cmdmode, N_("skip some commits for checkout"), BISECT_SKIP), + OPT_CMDMODE(0, "bisect-visualize", &cmdmode, + N_("visualize the bisection"), BISECT_VISUALIZE), OPT_BOOL(0, "no-log", &nolog, N_("no log for BISECT_WRITE")), OPT_END() @@ -1131,6 +1173,10 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) get_terms(&terms); res = bisect_skip(&terms, argv, argc); break; + case BISECT_VISUALIZE: + get_terms(&terms); + res = bisect_visualize(&terms, argv, argc); + break; default: BUG("unknown subcommand %d", cmdmode); } diff --git a/git-bisect.sh b/git-bisect.sh index 6a7afaea8d..95f7f3fb8c 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -39,29 +39,6 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" TERM_BAD=bad TERM_GOOD=good -bisect_visualize() { - git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit - - if test $# = 0 - then - if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" && - type gitk >/dev/null 2>&1 - then - set gitk - else - set git log - fi - else - case "$1" in - git*|tig) ;; - -*) set git log "$@" ;; - *) set git "$@" ;; - esac - fi - - eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES") -} - bisect_run () { git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit @@ -152,7 +129,7 @@ case "$#" in # Not sure we want "next" at the UI level anymore. git bisect--helper --bisect-next "$@" || exit ;; visualize|view) - bisect_visualize "$@" ;; + git bisect--helper --bisect-visualize "$@" || exit;; reset) git bisect--helper --bisect-reset "$@" ;; replay) From patchwork Fri Aug 20 17:21:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12450071 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53AD8C4338F for ; Fri, 20 Aug 2021 17:23:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3918061154 for ; Fri, 20 Aug 2021 17:23:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233006AbhHTRXu (ORCPT ); Fri, 20 Aug 2021 13:23:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230151AbhHTRXm (ORCPT ); Fri, 20 Aug 2021 13:23:42 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6B41C061575 for ; Fri, 20 Aug 2021 10:23:03 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id u16so15268628wrn.5 for ; Fri, 20 Aug 2021 10:23:03 -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=S1p9BU7/HgWV/1gFQbJBMzmsygz83jLigSmct0YDqdM=; b=R2DnKXcgvLiyMHC1RxKRKUb+sVUbGB7D0yvLQhxSY44/hnMfmoy8KgPIKX0pNiNYld QPR5z+tagIeI3cj3KKqNoaZPhgp1lIjciV/zCkMhKF/+Lgy5BHwpYNIOdCkmEz4UzWwy G/swyP2VVqQhHti1NItplDBHtvidr9Vi9Rrsp8K0+c4mBtxzELEQsIdELr2E3I37+B/L iFbGXA3xHewG834yuGu1PsAbsZnD2W5dVGf/UZBx9wQIhd5ixTNLFsadmIas2w5eRgOw /Roz+vuuTLUfWjf5AW71f1qKhINYjDWo51EFFNYoQ7aPSlLYl55/K9GRn+DFFLGHOyAm lESg== 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=S1p9BU7/HgWV/1gFQbJBMzmsygz83jLigSmct0YDqdM=; b=AGKURIQvkl6SxvVY7J8znplfu/SIltUYSH6jQo5nBzw7a4pQUSUVwzi3QTgQGW90x4 kDpGh3+P27YKdlZdp/+IwuNGsuVrDB5XFK8dMWO+4pgIGz49bVgmsboLRht0HGSoRT/O jJfkBNege1cK8Y24iTnd01VPhP/NxImJMDylz14xEKbyt2FSsRetBTG8Vw7y4YIPLtWa LlBE7Zfw4FwXgLlpOhDz661XpD70QY/1Sqx2rUCv5JRdKLaeZBKQKGAwN+4Z5qILiyY/ 8F5KlncEuTE8NNBy0dpzMA0iYcvSvrO+B8P5a3cZIz9gl4l/50ZbW0SpxK3jaKyacM5f ZW4A== X-Gm-Message-State: AOAM5327Zh1FDo7mImNvfL1ksuFp9l1KGSGHcCSMfRw380QuqQmfOudm 9E02RBTOSnpf3zoyF+iXOlDQ5sRNo5A= X-Google-Smtp-Source: ABdhPJw7hWJjmmeO0dnW5TOJ5PhUPCvQhlklefOR7L44h/ldtc0Y+DNstzoY02AyJ/BnPkzp+VZYGg== X-Received: by 2002:a5d:5085:: with SMTP id a5mr12040211wrt.62.1629480182493; Fri, 20 Aug 2021 10:23:02 -0700 (PDT) Received: from localhost.localdomain ([178.237.232.111]) by smtp.gmail.com with ESMTPSA id x13sm6623278wrq.44.2021.08.20.10.23.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Aug 2021 10:23:02 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Tanushree Tumane , Christian Couder , Miriam Rubio Subject: [PATCH v5 5/6] bisect--helper: reimplement `bisect_run` shell function in C Date: Fri, 20 Aug 2021 19:21:47 +0200 Message-Id: <20210820172148.2249-6-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210820172148.2249-1-mirucam@gmail.com> References: <20210820172148.2249-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Tanushree Tumane Reimplement the `bisect_run()` shell function in C and also add `--bisect-run` subcommand to `git bisect--helper` to call it from git-bisect.sh. Mentored-by: Christian Couder Signed-off-by: Tanushree Tumane Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 102 +++++++++++++++++++++++++++++++++++++++ git-bisect.sh | 62 +----------------------- 2 files changed, 103 insertions(+), 61 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 1e118a966a..8d33c809aa 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -18,6 +18,7 @@ static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG") static GIT_PATH_FUNC(git_path_head_name, "head-name") static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES") static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT") +static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-reset []"), @@ -31,6 +32,7 @@ static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-replay "), N_("git bisect--helper --bisect-skip [(|)...]"), N_("git bisect--helper --bisect-visualize"), + N_("git bisect--helper --bisect-run ..."), NULL }; @@ -144,6 +146,25 @@ static int append_to_file(const char *path, const char *format, ...) return res; } +static int print_file_to_stdout(const char *path) +{ + FILE *fp; + char c; + + fp = fopen(path, "r"); + if (!fp) + return error_errno(_("cannot open file '%s' in read mode"), path); + + c = fgetc(fp); + while (c != EOF) { + printf ("%c", c); + c = fgetc(fp); + } + + fclose(fp); + return 0; +} + static int check_term_format(const char *term, const char *orig_term) { int res; @@ -1075,6 +1096,78 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a return res; } +static int bisect_run(struct bisect_terms *terms, const char **argv, int argc) +{ + int res = BISECT_OK; + struct strbuf command = STRBUF_INIT; + struct strvec args = STRVEC_INIT; + struct strvec run_args = STRVEC_INIT; + const char *new_state; + int temporary_stdout_fd, saved_stdout; + + if (bisect_next_check(terms, NULL)) + return BISECT_FAILED; + + if (argc) + sq_quote_argv(&command, argv); + else { + error(_("bisect run failed: no command provided.")); + return BISECT_FAILED; + } + + strvec_push(&run_args, command.buf); + + while (1) { + strvec_clear(&args); + + printf(_("running %s\n"), command.buf); + res = run_command_v_opt(run_args.v, RUN_USING_SHELL); + + if (res < 0 || 128 <= res) { + error(_("bisect run failed: exit code %d from" + " '%s' is < 0 or >= 128"), res, command.buf); + strbuf_release(&command); + return res; + } + + if (res == 125) + new_state = "skip"; + else new_state = res > 0 ? terms->term_bad : terms->term_good; + + temporary_stdout_fd = open(git_path_bisect_run(), O_CREAT | O_WRONLY | O_TRUNC, 0666); + saved_stdout = dup(1); + dup2(temporary_stdout_fd, 1); + + res = bisect_state(terms, &new_state, 1); + + dup2(saved_stdout, 1); + close(saved_stdout); + close(temporary_stdout_fd); + + print_file_to_stdout(git_path_bisect_run()); + + if (res == BISECT_ONLY_SKIPPED_LEFT) + error(_("bisect run cannot continue any more")); + else if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) { + printf(_("bisect run success")); + res = BISECT_OK; + } else if (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND) { + printf(_("bisect found first bad commit")); + res = BISECT_OK; + } else if (res) { + error(_("bisect run failed:'git bisect--helper --bisect-state" + " %s' exited with error code %d"), args.v[0], res); + } else { + continue; + } + + strbuf_release(&command); + strvec_clear(&args); + strvec_clear(&run_args); + return res; + } +} + int cmd_bisect__helper(int argc, const char **argv, const char *prefix) { enum { @@ -1089,6 +1182,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) BISECT_REPLAY, BISECT_SKIP, BISECT_VISUALIZE, + BISECT_RUN, } cmdmode = 0; int res = 0, nolog = 0; struct option options[] = { @@ -1112,6 +1206,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) N_("skip some commits for checkout"), BISECT_SKIP), OPT_CMDMODE(0, "bisect-visualize", &cmdmode, N_("visualize the bisection"), BISECT_VISUALIZE), + OPT_CMDMODE(0, "bisect-run", &cmdmode, + N_("use ... to automatically bisect."), BISECT_RUN), OPT_BOOL(0, "no-log", &nolog, N_("no log for BISECT_WRITE")), OPT_END() @@ -1177,6 +1273,12 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) get_terms(&terms); res = bisect_visualize(&terms, argv, argc); break; + case BISECT_RUN: + if (!argc) + return error(_("bisect run failed: no command provided.")); + get_terms(&terms); + res = bisect_run(&terms, argv, argc); + break; default: BUG("unknown subcommand %d", cmdmode); } diff --git a/git-bisect.sh b/git-bisect.sh index 95f7f3fb8c..e83d011e17 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -39,66 +39,6 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" TERM_BAD=bad TERM_GOOD=good -bisect_run () { - git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit - - test -n "$*" || die "$(gettext "bisect run failed: no command provided.")" - - while true - do - command="$@" - eval_gettextln "running \$command" - "$@" - res=$? - - # Check for really bad run error. - if [ $res -lt 0 -o $res -ge 128 ] - then - eval_gettextln "bisect run failed: -exit code \$res from '\$command' is < 0 or >= 128" >&2 - exit $res - fi - - # Find current state depending on run success or failure. - # A special exit code of 125 means cannot test. - if [ $res -eq 125 ] - then - state='skip' - elif [ $res -gt 0 ] - then - state="$TERM_BAD" - else - state="$TERM_GOOD" - fi - - git bisect--helper --bisect-state $state >"$GIT_DIR/BISECT_RUN" - res=$? - - cat "$GIT_DIR/BISECT_RUN" - - if sane_grep "first $TERM_BAD commit could be any of" "$GIT_DIR/BISECT_RUN" \ - >/dev/null - then - gettextln "bisect run cannot continue any more" >&2 - exit $res - fi - - if [ $res -ne 0 ] - then - eval_gettextln "bisect run failed: -'bisect-state \$state' exited with error code \$res" >&2 - exit $res - fi - - if sane_grep "is the first $TERM_BAD commit" "$GIT_DIR/BISECT_RUN" >/dev/null - then - gettextln "bisect run success" - exit 0; - fi - - done -} - get_terms () { if test -s "$GIT_DIR/BISECT_TERMS" then @@ -137,7 +77,7 @@ case "$#" in log) git bisect--helper --bisect-log || exit ;; run) - bisect_run "$@" ;; + git bisect--helper --bisect-run "$@" || exit;; terms) git bisect--helper --bisect-terms "$@" || exit;; *) From patchwork Fri Aug 20 17:21:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12450073 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F8C0C4320A for ; Fri, 20 Aug 2021 17:23:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3836B61101 for ; Fri, 20 Aug 2021 17:23:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233951AbhHTRXw (ORCPT ); Fri, 20 Aug 2021 13:23:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233702AbhHTRXm (ORCPT ); Fri, 20 Aug 2021 13:23:42 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 870C0C061756 for ; Fri, 20 Aug 2021 10:23:04 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id q6so15261463wrv.6 for ; Fri, 20 Aug 2021 10:23:04 -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=SQdUT9oL8l2cZy0O1q3jtU4MPIlqqu+yIOQk9cEGs6U=; b=GWg5uy0WxQi/z6Hp9D7rTAonZ6MXbMprnQiM3LpneCzChGHJGsZ08uXUEZ7KRWyt1r 9i8dfr8XFU4Nx0GEbUosHyCZ2rMnc8R/rVbrbRppGWTvxacVfAam6z+OI/3P0Kgc2L4g ITfDQSZVPgtmiYBzgdmjusvYrQYvK1iQkg6N9vwXc5kCHulj5id/R8FJiBCo+c8Fh1FX rc/cSLMPPQRRInk+0i9bOFUuhIpju8DRd07fr1ZGObbwUNFQy2VM8SJwwJi9OrkGdRBB E6YhEKPipyGytwG6rIli3Gsw9nyUqU4WQ84gu7pPIOHlTHeZ7mGhnmtTFB6Chp60INfu bszA== 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=SQdUT9oL8l2cZy0O1q3jtU4MPIlqqu+yIOQk9cEGs6U=; b=QroJx8IUpwUJaT6TKeWimZIRYs/wXy/Tf/5AklJCBoat5Z0AZ2+AyxWTRdv4yAe8L1 GVg0iciCNVc7ddeLOFZQ8vfUqQ3Mn8YWiQE/zqCT4fFmUm8SMUeVW0BbmyMlpjBx8ZK6 AOpLNaFBCQ6w3mKIQmyi/vGAVg32k9WaFZIY6s0EL9V8Lw8EOjOH8SpqhGPAdIKOcZwE Zt4Tvc0fSO1iLA+HOrX11iWzHZZbCVckzkGPjKPHsZDetBex1owBFCvb4930N3t/FylW hq6v2hTMoMvMVn0TkUQ4MdSTaO8h34nftYHLqgz2YQ0YAAy3Q15GluaXhBMMkczaN7Ac 3ojQ== X-Gm-Message-State: AOAM531Av/6s1xdSzfmKrneaP/AiVqNh1jjHZVKB7BHRTM+vFcCbMUFk gvy8+Zovfmo7/E+xfnQrIqsW0NZgt5k= X-Google-Smtp-Source: ABdhPJx4xe5mXkKObVj4WYce6Pt7xmi5dtU2/1shJ7pPUN9NFtbC2CxKyYN2C+5wVDZ5iXu/iB1Y4g== X-Received: by 2002:a5d:4143:: with SMTP id c3mr11725828wrq.29.1629480183206; Fri, 20 Aug 2021 10:23:03 -0700 (PDT) Received: from localhost.localdomain ([178.237.232.111]) by smtp.gmail.com with ESMTPSA id x13sm6623278wrq.44.2021.08.20.10.23.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Aug 2021 10:23:02 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio Subject: [PATCH v5 6/6] bisect--helper: retire `--bisect-next-check` subcommand Date: Fri, 20 Aug 2021 19:21:48 +0200 Message-Id: <20210820172148.2249-7-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210820172148.2249-1-mirucam@gmail.com> References: <20210820172148.2249-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org After reimplementation of `git bisect run` in C, `--bisect-next-check` subcommand is not needed anymore. Let's remove it from options list and code. Mentored by: Christian Couder Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 8d33c809aa..6e1e7c243d 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -22,7 +22,6 @@ static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-reset []"), - N_("git bisect--helper --bisect-next-check []"), N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"), N_("git bisect--helper --bisect-start [--term-{new,bad}= --term-{old,good}=]" " [--no-checkout] [--first-parent] [ [...]] [--] [...]"), @@ -1227,12 +1226,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) return error(_("--bisect-reset requires either no argument or a commit")); res = bisect_reset(argc ? argv[0] : NULL); break; - case BISECT_NEXT_CHECK: - if (argc != 2 && argc != 3) - return error(_("--bisect-next-check requires 2 or 3 arguments")); - set_terms(&terms, argv[1], argv[0]); - res = bisect_next_check(&terms, argc == 3 ? argv[2] : NULL); - break; case BISECT_TERMS: if (argc > 1) return error(_("--bisect-terms requires 0 or 1 argument"));