From patchwork Tue May 21 17:50:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 10954375 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8222D17D2 for ; Tue, 21 May 2019 17:50:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70D8128A19 for ; Tue, 21 May 2019 17:50:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 651AD28A70; Tue, 21 May 2019 17:50:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1775628A33 for ; Tue, 21 May 2019 17:50:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729165AbfEURuW (ORCPT ); Tue, 21 May 2019 13:50:22 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:35703 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729135AbfEURuW (ORCPT ); Tue, 21 May 2019 13:50:22 -0400 Received: by mail-ed1-f66.google.com with SMTP id p26so30689853edr.2 for ; Tue, 21 May 2019 10:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=TJlPxt06C0FkP8ovRz0Bw2rL9zlMpUsaEueRFtg7Wtk=; b=I+7sv+3y8sj8P6ExRTRBX6WEBZLDI6vUm2GjvjIQWpsEQs34faQts7zIeHShhHRkPn dRF4lhEmKzhS5nWF+oGtZsq9Pq/C4szHQz2fpnbV08wl5fMIcWiOCLd3k0TuNBsKMyqp MbHafBZIktHclCnGqKG90IgQ1jPCc60Nb+HEyHmYiXDzyt5RUXFbtniimTLCSV9x6Q9O RU6eLkgNIBf+qu+/YnYqpHoNWZyEvRd5yxVyRim3LIVpyE4klzUfz+E9RP1pVKT4UeYh 4C+Bc1k68/CqgaqU1azIRmD8e1Dww1KjXAtjx64PxKE32zFax4fRMp4uww2eFwF0mZVz 2fqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=TJlPxt06C0FkP8ovRz0Bw2rL9zlMpUsaEueRFtg7Wtk=; b=Pp79b/8GkUuF4q7D2YJfxCuwDA3vzOo6V8Gefc6+LsTcNq5MmucsP/emypb+h2QDRh lWGx3sz4oW1XKPzncCp/Dwgfh5gADMpN3tJ87d+4P1AsfY46KB3dYxwhkPYVlt2+AbPI a/sukhzPwzFCC62pDTGEoJrStvhsDCJuDWWkwKfj64jAV0bPjPJpbsyz4TmrXYcTRc69 EnBtHRXfIXAOyhKX4qVm/wahx6lu0hmBV5ba97vHxqduCkgUoZtNWnDz4ahrUlH6tfnN 5vjMdOhfrW/2E9HPbTgmjqRXieijL3mTi+wxsJ1npY8+XsNTxGg3EAt076hC95Td5vHP qD3g== X-Gm-Message-State: APjAAAW/P1f2wzTMwmqzSSD3VpzBk33bn9z7a22pkrCF17r/jnPxukvP O9Uhd87up6oAJzhkYMfwdr8x7DKK X-Google-Smtp-Source: APXvYqxkjWIJ0K++DjazcLj6U1eEITe89oGRYmkGwG7HSGcXnV3u8ykT+/efoBlD8rli1YdVRFlK8Q== X-Received: by 2002:a17:906:66c9:: with SMTP id k9mr17872209ejp.21.1558461020771; Tue, 21 May 2019 10:50:20 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m4sm376846edc.24.2019.05.21.10.50.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 May 2019 10:50:20 -0700 (PDT) Date: Tue, 21 May 2019 10:50:20 -0700 (PDT) X-Google-Original-Date: Tue, 21 May 2019 17:50:17 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 1/2] rebase: replace incorrect logical negation by correct bitwise one Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin In bff014dac7d9 (builtin rebase: support the `verbose` and `diffstat` options, 2018-09-04), we added a line that wanted to remove the `REBASE_DIFFSTAT` bit from the flags, but it used an incorrect negation. Found by Coverity. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index ba3a574e40..db6ca9bd7d 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1203,7 +1203,7 @@ static int rebase_config(const char *var, const char *value, void *data) if (git_config_bool(var, value)) opts->flags |= REBASE_DIFFSTAT; else - opts->flags &= !REBASE_DIFFSTAT; + opts->flags &= ~REBASE_DIFFSTAT; return 0; } From patchwork Tue May 21 17:50:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 10954377 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FBB5912 for ; Tue, 21 May 2019 17:50:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F1B528A19 for ; Tue, 21 May 2019 17:50:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6336728A37; Tue, 21 May 2019 17:50:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82ABB28A19 for ; Tue, 21 May 2019 17:50:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729167AbfEURuY (ORCPT ); Tue, 21 May 2019 13:50:24 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:35706 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729152AbfEURuW (ORCPT ); Tue, 21 May 2019 13:50:22 -0400 Received: by mail-ed1-f65.google.com with SMTP id p26so30689917edr.2 for ; Tue, 21 May 2019 10:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=CYXLfruxX9xahrZuMhbh7ZEw2pmkRyjITmjyZ4jRIC4=; b=MLJPxT3d5YGgri4y2I70nmXxuVlNgQIRURRsiC3CnFgvnX2UbOsjcTTAbktA7aXPY9 v/zo6hch7+X/K70BpQdWs4kDdMbE3WMuan/zOQw4gJT8eZqAaqZlk9GPZOUy58eGaTsv lnEgHYieg2MeCudLz4vQtw8gqIM7jiNOWIdGIfpi4iFsGoC2l0Svl5wxY19cnanQmN/t cNQxjmlUsAVe9NDi7td2tUGajHofKGThijhU+0r27UkPYqslnSjDaMPDIBGKfFtiMmKI G3Uho8mlh5aywxb4nXHsCPKPLHNpI4niiuBWDyS5SGds3N/+Wo5UOnMSmWk/FQ1cNABW cfpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=CYXLfruxX9xahrZuMhbh7ZEw2pmkRyjITmjyZ4jRIC4=; b=hypx2XWTZCmkmF2AZl9MAMEXwNzqTNxAa1ZWaO/To2wwhPvK9PQQ8vlD7z+dYajtxb II20cmcPv+uPVbMzDGhxon3/wahe7uW3YpqwEFjzTzEqMdGCCNIj03001exX+Vssmcko A9ArNBzuHX+RqAaIrfBePTSbN2RNDcLKe2BWoPUpE1TA0FKAdCKNFMFWoi/aQAJ6V+YA k4VTbekAO61FIYnc89yL0uafNRiGs4G7UTzaZIjrOTMV9VgJQDE1KkolwoRPWIlDuPEK 2mh8u5YdRjHaHmq4aMY8wOKu85DX/C8517u10ptW7u8dHgO5pniYCJuUDVBGM8V+x5rO iLsA== X-Gm-Message-State: APjAAAVyxZ9aSXWTXGVTQGZrzhkxSDYSQT3wOh20HGPDeVL36kXQdu3u /ni0lPD1WPAAuCGMe8VR5GXaunpM X-Google-Smtp-Source: APXvYqzDN3FAn69hdwZuxZE8TEp68ZZOtRHSJOazDi7ndOBcEYezOIJptyr1RGOTI3LZn1Di3/eoVw== X-Received: by 2002:a50:9952:: with SMTP id l18mr85076755edb.150.1558461021461; Tue, 21 May 2019 10:50:21 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t2sm6404822eda.41.2019.05.21.10.50.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 May 2019 10:50:21 -0700 (PDT) Date: Tue, 21 May 2019 10:50:21 -0700 (PDT) X-Google-Original-Date: Tue, 21 May 2019 17:50:18 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 2/2] bisect--helper: verify HEAD could be parsed before continuing Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin In 06f5608c14e6 (bisect--helper: `bisect_start` shell function partially in C, 2019-01-02), we introduced a call to `get_oid()` and did not check whether it succeeded before using its output. Signed-off-by: Johannes Schindelin --- builtin/bisect--helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index e7325fe37f..1fbe156e67 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -570,7 +570,10 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout, write_file(git_path_bisect_start(), "%s\n", start_head.buf); if (no_checkout) { - get_oid(start_head.buf, &oid); + if (get_oid(start_head.buf, &oid) < 0) { + retval = error(_("invalid ref: '%s'"), start_head.buf); + goto finish; + } if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR)) { retval = -1;