From patchwork Mon Sep 13 17:38:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12490283 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 1779AC433EF for ; Mon, 13 Sep 2021 17:40:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 014B4610CC for ; Mon, 13 Sep 2021 17:40:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346384AbhIMRlV (ORCPT ); Mon, 13 Sep 2021 13:41:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243866AbhIMRlK (ORCPT ); Mon, 13 Sep 2021 13:41:10 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25699C0613CF for ; Mon, 13 Sep 2021 10:39:15 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id t18so15978235wrb.0 for ; Mon, 13 Sep 2021 10:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PBuMCp9wye4nJ0EwkJl/E213+4vvdkP7RervuT74vis=; b=fZGbyTq5tBRwTz9iAYBy44nSBH2WNMxYi8iNl9JeHlWl8Wb/sTvD7LgBNog9Xp/pPj gnDRZZ1mQEkt8RrAGymM7sxmUOw5W19V9xCaug1K5/WY9AVHM6TcX8nymtz/tBD4XjFL 1m/Z3gq7tt9NqjTrZzR06XPZfBaA5rbBWX85w3PMBIvV5WEg5AW0ip4Vp0lqRM0XWFLn mFC4RVpAqsjx1X9ztx8tWi+n5KhOvZ0P8y8+SjdRiW9yp7fHQuVw8V2EA3tjM2o20fyA dhp4Pyrsg2UIyjqFcEcL7EiQ0OjWZoSM6NT+hLivE9UtJDgmMxbvbr8j/wG8ROz5MXjx R/1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PBuMCp9wye4nJ0EwkJl/E213+4vvdkP7RervuT74vis=; b=7caWRzuupdI36ymgGgz0yMnykyTMdkNAePvjuSCm+01TCxOukjQ7EGtz705wp58LOD Hd36qx1zhNjT9O/rr9wIeBa+SYaZMw2vHE0KoEIiRg3xe4XrHbGEoA2weAzhxIzAvGfl o3RZF9v75zob5JeqkCcutXHQQ77IVON6xHPqjCQigORM1AX+X4tiNf3WJrhPRE4Kv5oO 4qDPbXl/nTNd3Z6g4mPcBXlgVjKjgFMSzcsakIiHgj5tuFwyvxYRqHp8XDqzXpwmGRSg woQvAluKNmzFz5MDcKmy9xhXP2Mdf9TK/TBfqGgwYgPYxiuHHI3I3BnZHR6Lw44c7Pe5 oZLQ== X-Gm-Message-State: AOAM532OE+1R/3BZDVqHOx+lqkFbUTt1Fs9J47ts574uq6IRZ7bAQgy3 ANOw0uco5zDtyi/3P+GjNor0lXuskgM= X-Google-Smtp-Source: ABdhPJxtWv5zBv/c285bvG/Z026/3eojHfOP4YEQx3j63Pq+TQfO7k03o8ZYn8EJlIdllhdYoKYLMg== X-Received: by 2002:adf:fd03:: with SMTP id e3mr14042424wrr.46.1631554753810; Mon, 13 Sep 2021 10:39:13 -0700 (PDT) Received: from localhost.localdomain ([81.0.34.57]) by smtp.gmail.com with ESMTPSA id u25sm4428959wmm.5.2021.09.13.10.39.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Sep 2021 10:39:13 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio Subject: [PATCH v7 1/6] t6030-bisect-porcelain: add tests to control bisect run exit cases Date: Mon, 13 Sep 2021 19:38:59 +0200 Message-Id: <20210913173905.44438-2-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210913173905.44438-1-mirucam@gmail.com> References: <20210913173905.44438-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..5986fbecd1 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 + EOF + test_must_fail git bisect run ./test_script.sh && + write_script test_script.sh <<-\EOF && + exit 255 + EOF + test_must_fail git bisect run ./test_script.sh +' + test_done From patchwork Mon Sep 13 17:39:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12490285 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 11502C433F5 for ; Mon, 13 Sep 2021 17:40:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED25A610D1 for ; Mon, 13 Sep 2021 17:40:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346622AbhIMRl2 (ORCPT ); Mon, 13 Sep 2021 13:41:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343524AbhIMRlK (ORCPT ); Mon, 13 Sep 2021 13:41:10 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6660C061786 for ; Mon, 13 Sep 2021 10:39:15 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id k5-20020a05600c1c8500b002f76c42214bso7608136wms.3 for ; Mon, 13 Sep 2021 10:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LAObiEFm2DHUQ4KXSDgBkJFVd+MCaW15Pp6fawy8Adc=; b=GSM8pc70roDZhn12NL3HFJPXuLtpPiI0rNWq0QYPewRCB4gE+hDVIhLcU1KuRdewSc krZaGqm+qphZDOmWxDcC9RAGG8JMPit9aOFPP2CFiUezf968FKouB5u6K9uV+HNgCoXP VFFIB61fVQZ8lRwdEkiSdecshp9eLOmWTRr46ip/u6g+VIq179lQDZh7J0CxGL4fg4y0 uCvZJAma0WNVput/qRN/Wr2rIb6AaovL1L6Z1WjGewUCAlmEgAO1IgsiP8JPq6bFWM61 rIR2+X5sluOq4nQ2JPhF3X3rL7t/KXhtGJWO2HyJnZ/OldKiDxmqjm4lAJqNqTLE4Ky1 l8vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LAObiEFm2DHUQ4KXSDgBkJFVd+MCaW15Pp6fawy8Adc=; b=zRlNNOunpwxRJvnQRLBosYKpMr2mK1qfffsE8bHzClxzFKIIY9m0NHe7n5/beCykbp mH0LYMEU4iaiW4jcZ3HWtfQssb97o52qqvf9gX+1GFY0CxOcydzWiWC7pydbHvhWskxz 0sfpa83E03jJmyPRueCVumvTdK/+f85wMk3spmfdr21ezxtgtNIuLtbFpdKEAAIBpsAo KYZRQxHIU7Y4ZeLZsy0lCXsYWXJRYMRLE7Ry4rOeQP+Wg0QZxDvXU7CNC2+w0hn0QqcE Ei60Tk1J+Fqu9+/J2J7raNOFYXFO56Vq7q5tL4TVwht+OCqXQyQpNFbn0gg2WTv9BmE8 MR7Q== X-Gm-Message-State: AOAM531RkH7Emev9yrVqz86Ds7o97UrTa70Jo6Q9s6fi+a1IdOEkKUtJ r8mjjf6bOGTGBGwfBXuVsXBxPVQA5Fo= X-Google-Smtp-Source: ABdhPJyFoLTi927SqAU4s6bVrEUp0W/ziSNJQmgVXyczFE8BPrTp3w/KVk0hTOkfoP4zKEArt9olPQ== X-Received: by 2002:a1c:f607:: with SMTP id w7mr12764583wmc.65.1631554754426; Mon, 13 Sep 2021 10:39:14 -0700 (PDT) Received: from localhost.localdomain ([81.0.34.57]) by smtp.gmail.com with ESMTPSA id u25sm4428959wmm.5.2021.09.13.10.39.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Sep 2021 10:39:14 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio Subject: [PATCH v7 2/6] t6030-bisect-porcelain: add test for bisect visualize Date: Mon, 13 Sep 2021 19:39:00 +0200 Message-Id: <20210913173905.44438-3-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210913173905.44438-1-mirucam@gmail.com> References: <20210913173905.44438-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 5986fbecd1..1be85d064e 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 ' +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" +' + test_done From patchwork Mon Sep 13 17:39:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12490287 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 F393CC433F5 for ; Mon, 13 Sep 2021 17:40:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE0D7610CC for ; Mon, 13 Sep 2021 17:40:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346663AbhIMRle (ORCPT ); Mon, 13 Sep 2021 13:41:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243422AbhIMRlL (ORCPT ); Mon, 13 Sep 2021 13:41:11 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 822BEC061787 for ; Mon, 13 Sep 2021 10:39:16 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id l18-20020a05600c4f1200b002f8cf606262so7631759wmq.1 for ; Mon, 13 Sep 2021 10:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a2irW1fv9RC72W8TrdM2XrhdmNH14LBTJLZt6TJqbm4=; b=AihB8xTT+P81dNEheEnXVmKI2eJXcRtldlGYDenhTUA0fGiL80pqKcIOVvvM8MEcZC Rte4wgTWnRJLcvMru8CugeFxQbnAIdi4DYxa8sRNqZTnO0O8DKg1rQCxXscqkq0TABW8 xk9viuyN4IgQ9kYflwEkn9vhzYllSjK55pgfjiVKIc+Lq1T+7DCZibV+lqY+Vjbwh8Fx T+6Pkf8ZcCSkHhwusEeNhUCpo8Cs11brTWxP3Lt32DhlOa/6pLdYwEH1njd/PrwL87A7 ZPNdyJMmvNqpV7R6wwwnfM+MncnsGC0WVH98x1sHsB26S25l2KUTkwizK7A4F1RVlVy6 6v2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a2irW1fv9RC72W8TrdM2XrhdmNH14LBTJLZt6TJqbm4=; b=q7/PBxIwvYQHOt/+gsiCURN9fo2jo63gMX3+QXO5xvoYssnRfd7ae26NW17LJVwvWf z0yAwtQpuczqrTXmfzeCC53lQhwc5gp0FVU0ikXFdKaScGk6/6MpD8Mutvrffnp33ZDM 3B3aIc8uzLrERpJXosBHm+QT8+zRknhlPxDrF6qTWA2/+CdPgdCofiQU42BKoQV6P+Y4 EPX6P2z9aGHnt+6eM3f4GVaIKXnT1cbGEP+0zNOyikio/nJSvrUBuF4+9kaZd+rit8+A Idxmq3juS4dm4hjbsiaZA9+BwLOwg+QJ16Tx1704ustFc5MstWn/rz0g11vLkG+WS9TQ cPiQ== X-Gm-Message-State: AOAM530yM9lEk343AqdOXtfXzXYoVxP0aq5Z9Ire7Rc4nk0I9vb4FlEi KLZ8OVFMxdayDPON8RfilxbAsKidBPQ= X-Google-Smtp-Source: ABdhPJxBreMrjLFkP9K8X998Rg9B2SWchKWlcJGXFLF0d2n9oiAcasZd8NCAByGb7oegJVFM1PNhhQ== X-Received: by 2002:a05:600c:4ece:: with SMTP id g14mr12191904wmq.6.1631554755136; Mon, 13 Sep 2021 10:39:15 -0700 (PDT) Received: from localhost.localdomain ([81.0.34.57]) by smtp.gmail.com with ESMTPSA id u25sm4428959wmm.5.2021.09.13.10.39.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Sep 2021 10:39:14 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Pranit Bauva , Tanushree Tumane , Miriam Rubio Subject: [PATCH v7 3/6] run-command: make `exists_in_PATH()` non-static Date: Mon, 13 Sep 2021 19:39:01 +0200 Message-Id: <20210913173905.44438-4-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210913173905.44438-1-mirucam@gmail.com> References: <20210913173905.44438-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Pranit Bauva Remove the `static` keyword from `exists_in_PATH()` function and declare 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 | 4 ++-- run-command.h | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/run-command.c b/run-command.c index f72e72cce7..da02553f44 100644 --- a/run-command.c +++ b/run-command.c @@ -210,9 +210,9 @@ static char *locate_in_PATH(const char *file) return NULL; } -static int exists_in_PATH(const char *file) +int exists_in_PATH(const char *command) { - char *r = locate_in_PATH(file); + char *r = locate_in_PATH(command); int found = r != NULL; free(r); return found; diff --git a/run-command.h b/run-command.h index af1296769f..aad027984d 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); +/** + * Check if the command exists on $PATH. 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 command 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 *command); + /** * Start a sub-process. Takes a pointer to a `struct child_process` * that specifies the details and returns pipe FDs (if requested). From patchwork Mon Sep 13 17:39:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12490289 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 44F4FC433EF for ; Mon, 13 Sep 2021 17:40:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2EADF610CE for ; Mon, 13 Sep 2021 17:40:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346685AbhIMRlj (ORCPT ); Mon, 13 Sep 2021 13:41:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243704AbhIMRlM (ORCPT ); Mon, 13 Sep 2021 13:41:12 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49342C061796 for ; Mon, 13 Sep 2021 10:39:17 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id l18-20020a05600c4f1200b002f8cf606262so7631777wmq.1 for ; Mon, 13 Sep 2021 10:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=svuTiytlsV2jEigGLw85bhyc8R3NuBgzY5FmAqU37X4=; b=coepdZujiXPBGpXRqIb1g7vNK3oeGqL4ErmdbVAbOD9a7Pm+n1S3H1qfONPLSpxZXb w6D4Nv5MVK5iaC3Pl2T4YcXb4qw7vWjBzhJT0KXsCb7MKRG6Rh2fIYRNC8X5QRIHBtk3 xIc1bDLWMT/+bxxau3UQRAyPyXMf1H+d3iHg5wMP+howlKT4yMvKk6lzLwIF4eOqZsju mMVmLFzw2GFGRDHfScnUputkyehKqyzv/TxeoWqqO9x5v26xuSMpq5LwTtq1CgMVO4KQ pH5CD4hBvpxkkqTtWoAsOd43cpvFGewgKYHF4L7TeY5MsPqcF+gQfMNG9cJUqO7Q2K87 vSFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=svuTiytlsV2jEigGLw85bhyc8R3NuBgzY5FmAqU37X4=; b=MpXbGFBWq9z/5yZ1ckA/PWfTTC2yz6152Efr5IM/7Z4/1s08y7+o/7W8QwGJAmoISw 3eeSjnfqcnjnxrc18rsoHharGJ7zs101C4Gv8cJtzXRIjFfgfVBwhVLa2dnuTuGxtxNX SKf469YlZLIH4OS8+J9GEY4zH1gfQY6LZlj5Sj6yO2qYyRkZbPKVfIjEcOTUZp+k/g+e 212Omq1cnZLemwvlURmBZMOmi5hAn8LMLC9NDKTmlKMzpmH5bFFnweiyEcQ4UiS3IIb+ bxop33QJKfnJYssaHHYoxBdSimcHz7RiLWE3vNz+al8rcj22kXempoNzDTPLVMsqmt3w uc2w== X-Gm-Message-State: AOAM530uDipxopJaBM1/K86mipani4dcexQR8ZS77M2yYnKBYtugdwRk 8bZfz8l8amwSzTw5zFCEeN0JmOBFy6w= X-Google-Smtp-Source: ABdhPJyvzsjDSFHP0jiuOKy1G30B/va1eE0+8d69Tj87mxQoQyhw5O8r+7DJ4ENA7P/zXG6vep9KNQ== X-Received: by 2002:a7b:cb09:: with SMTP id u9mr12580335wmj.63.1631554755866; Mon, 13 Sep 2021 10:39:15 -0700 (PDT) Received: from localhost.localdomain ([81.0.34.57]) by smtp.gmail.com with ESMTPSA id u25sm4428959wmm.5.2021.09.13.10.39.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Sep 2021 10:39:15 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Pranit Bauva , Christian Couder , Johannes Schindelin , Tanushree Tumane , Miriam Rubio Subject: [PATCH v7 4/6] bisect--helper: reimplement `bisect_visualize()` shell function in C Date: Mon, 13 Sep 2021 19:39:02 +0200 Message-Id: <20210913173905.44438-5-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210913173905.44438-1-mirucam@gmail.com> References: <20210913173905.44438-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..1465310734 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 Mon Sep 13 17:39:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12490293 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 89718C433EF for ; Mon, 13 Sep 2021 17:40:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 70709610D1 for ; Mon, 13 Sep 2021 17:40:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346701AbhIMRln (ORCPT ); Mon, 13 Sep 2021 13:41:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344671AbhIMRlM (ORCPT ); Mon, 13 Sep 2021 13:41:12 -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 EB2A2C061797 for ; Mon, 13 Sep 2021 10:39:17 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id x6so15911094wrv.13 for ; Mon, 13 Sep 2021 10:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tJvXCdQwq20j860N/extc/9doqrCnzuR6uR/99nLMgw=; b=j2UzAGaR/nUqm5X8oJKEj4nJu/s7Oe40mL/+27sC3PiLatGHzuX7VYbV4l6TFhKpqA XJDux8IOMAUr4ZSwBpRSe5//w+mzMjJznChsaf81ywOKeflp0cKvdfP4z5U6ki4Kggoe joXWfoTxH77COuzyWkxwpZSfUfY1zVZMahRsY3BHUXYzQpoaPtjBFLk7+91G2T2/dXDm CUD3WnxkViW0xsis6b+WwyR/uD0al/2ewDeXitDzqdpzdcT/9OHYmoHYgzo9TP4LWLw6 fuZ8pZZrUwpmbeUxT8Yx1UwjZTnV9FBD9OPu/hA5YNxMQ5lhCBDlrOitaFno0LrR9KOd W2bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tJvXCdQwq20j860N/extc/9doqrCnzuR6uR/99nLMgw=; b=QYpq9S0NgGWX/ihrZsAw/mFfAbKU9hMFx5rzQMWQMyTwqys1ppvlpKYWyPstDYW2vU XyZiWATHIIJ0hzwKW/cR11jltK1Pd6fth34Qx1tqs3AO17lyi7rwuBn9jOJkEBqrJPqX tfX0m2L6/Og2nArVpRAGMnQY/Onjyw+4pmhg8jXFIFC2EoZdZoNQbueG8CELfwZ6gplr Yi9c8SpGkG/HqWblE8Y+Yx7wGGArKDUpY71zTzvYpH4XwITprlYuM5/kqKsINJN9D4V2 ferxw8kMCZBwf6W+wTDv2Lw8cyq0im7C9HX/pfVKTU808YP0Dgi6kiT7bwztBpuLwII0 aJ2A== X-Gm-Message-State: AOAM532oHFXI/PbUsdXQsMOwoubNReE8vh99PwE1xgkO7jBR1MVa0V77 tRU7WkGJd+n91sR7SAgTp8m3ThXBsrg= X-Google-Smtp-Source: ABdhPJxHgC3lFuIKzoMBOUgNv8AdzbhlFMHr0ctK/B2y2uNA4C/mIN/y1uiPdIyJU518jSGMtC7vcg== X-Received: by 2002:a5d:67cc:: with SMTP id n12mr8454220wrw.381.1631554756566; Mon, 13 Sep 2021 10:39:16 -0700 (PDT) Received: from localhost.localdomain ([81.0.34.57]) by smtp.gmail.com with ESMTPSA id u25sm4428959wmm.5.2021.09.13.10.39.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Sep 2021 10:39:16 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Tanushree Tumane , Christian Couder , Miriam Rubio Subject: [PATCH v7 5/6] bisect--helper: reimplement `bisect_run` shell function in C Date: Mon, 13 Sep 2021 19:39:03 +0200 Message-Id: <20210913173905.44438-6-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210913173905.44438-1-mirucam@gmail.com> References: <20210913173905.44438-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 | 105 +++++++++++++++++++++++++++++++++++++++ git-bisect.sh | 62 +---------------------- 2 files changed, 106 insertions(+), 61 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 1465310734..ea966268df 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,19 @@ static int append_to_file(const char *path, const char *format, ...) return res; } +static int print_file_to_stdout(const char *path) +{ + int fd = open(path, O_RDONLY); + int ret = 0; + + if (fd < 0) + return error_errno(_("cannot open file '%s' for reading"), path); + if (copy_fd(fd, 1) < 0) + ret = error_errno(_("failed to read '%s'"), path); + close(fd); + return ret; +} + static int check_term_format(const char *term, const char *orig_term) { int res; @@ -1075,6 +1090,87 @@ 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 if (!res) + new_state = terms->term_good; + else + new_state = terms->term_bad; + + temporary_stdout_fd = open(git_path_bisect_run(), O_CREAT | O_WRONLY | O_TRUNC, 0666); + + if (temporary_stdout_fd < 0) + return error_errno(_("cannot open file '%s' for writing"), git_path_bisect_run()); + + fflush(stdout); + saved_stdout = dup(1); + dup2(temporary_stdout_fd, 1); + + res = bisect_state(terms, &new_state, 1); + + fflush(stdout); + 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 +1185,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 +1209,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 +1276,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 Mon Sep 13 17:39:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12490291 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,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 DFCD4C433F5 for ; Mon, 13 Sep 2021 17:40:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C000D610CF for ; Mon, 13 Sep 2021 17:40:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346104AbhIMRlm (ORCPT ); Mon, 13 Sep 2021 13:41:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345273AbhIMRlM (ORCPT ); Mon, 13 Sep 2021 13:41:12 -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 A5214C06179A for ; Mon, 13 Sep 2021 10:39:18 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id q26so15927723wrc.7 for ; Mon, 13 Sep 2021 10:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xa4pIlQfZnxCkkX3Ypij38tWKBvHdruyI+vWoy8HMMk=; b=UOeUO+D5tR9OgZmV/CMu/y0Nqb3kfW8GxkpArRJWLqVL4Hm07JsofSv5UiAz2q1vEE SAuPHFxhkbwbCMDDlt54R09Lj3aA1Quewkf0OzWHRFU2xc/pGNb8W8uYC6LX3l37Vkoc ow0mn089JIz7YtzUqSuG6CHbpAqstYkDPk/Tp1asLefom/n9iaGFatqjyRJ4dDjchyCO WBQ5EnPHZyohxINGdTRtBdIv15McEhDTqqE3HISRjxfFunoIWSeUwoKYFnKzbnYUZt4S 2QOjoDzA1FF/J3606/HGMBTeiROH7HSa74w3kO7+yYD+dm65emFo+qEqWjFkMj7GsuEB jfWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xa4pIlQfZnxCkkX3Ypij38tWKBvHdruyI+vWoy8HMMk=; b=jWSmN+EV2rz4nCeT5uRW+ex/1wvKXb1+6WgU976RzBkv/a4uJZnN6X9mQqWXtblqN/ o+EuSumXRaLwhwVncYN56Uenm3gA7Jpu/bZ0SGcDVPsSY7okj4guXfMMJM91IS7toOrz F1EbmGzSISQqSfM5rTJhJd6ShowY/8mQFElgF5fm3a8Wy3fVW8BYPDww5WkFZwQOF/op /GJynv3Iq/OProupSQcFOQ7jZwLiWRCpdywZlok9vj9/shTZxZzFwZQTFcyD0j7Eeh5s 1NHcoGG79qv3Y9RHA4LGEv1G2TfpfE/xm8raKYIRGX84xTPz3lzzsuBpAshkc16ZXu+s dteQ== X-Gm-Message-State: AOAM531empxMzZ2kGNn+zPXkOKv+fFuFobAB6OK2dpt47T5mh49psv2S QO16b4FEYIPrSu2P1ScmJraDmqdVqMs= X-Google-Smtp-Source: ABdhPJwQ1AfgCANNTjA7SswuYSzAyc4xpBfhd2HXn6MXvYkPmj5dprzj/aoNrCIzm1BpAld9GUUywg== X-Received: by 2002:adf:e384:: with SMTP id e4mr13942757wrm.163.1631554757178; Mon, 13 Sep 2021 10:39:17 -0700 (PDT) Received: from localhost.localdomain ([81.0.34.57]) by smtp.gmail.com with ESMTPSA id u25sm4428959wmm.5.2021.09.13.10.39.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Sep 2021 10:39:16 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio Subject: [PATCH v7 6/6] bisect--helper: retire `--bisect-next-check` subcommand Date: Mon, 13 Sep 2021 19:39:04 +0200 Message-Id: <20210913173905.44438-7-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210913173905.44438-1-mirucam@gmail.com> References: <20210913173905.44438-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 ea966268df..bc210b23c8 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] [ [...]] [--] [...]"), @@ -1230,12 +1229,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"));