From patchwork Fri Jan 18 09:50:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 10769641 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 7C1DD91E for ; Fri, 18 Jan 2019 09:50:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A3982A1B1 for ; Fri, 18 Jan 2019 09:50:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E1202E835; Fri, 18 Jan 2019 09:50:20 +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 0B1432A1B1 for ; Fri, 18 Jan 2019 09:50:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726919AbfARJuS (ORCPT ); Fri, 18 Jan 2019 04:50:18 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:40337 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726379AbfARJuS (ORCPT ); Fri, 18 Jan 2019 04:50:18 -0500 Received: by mail-ed1-f68.google.com with SMTP id g22so10642488edr.7 for ; Fri, 18 Jan 2019 01:50:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:from:subject:fcc:content-transfer-encoding :mime-version:to:cc; bh=ApSa0HbMprkFrbJ4zcTzMF2MqeAUrUIk1djCAznN2qw=; b=K0cdP4ncddPauIqa8qTdG8CoQOKmOcfCAN3guky4cV5HkS0/oZ+hnYHTg4n8GBjnp4 IPFLs/3m/8X2BLfFbTq6LgNazXhVsw29zxP9VZEuh581UAVFElP7QXErarsAtKqWzEq8 c2nkSIu1uZp1HwlcCWOB7MTYNR6hAJ28rIaQIwwqA0Aylc84POcy6jDMgSkMeNAigv4N LDMKJOTgAXuGdwIeRGxma5Mhu4PfAnpwqp50+t0ebzANlbTDxm2VNWAIUNEdJvPlvhOm jNt3e2LSiqUk+MbAxRXObiNSf14gvQWrSR/FH7gu4B1lSTYLHAzuRPMuHBBh0CgPuGp7 NwoA== 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:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=ApSa0HbMprkFrbJ4zcTzMF2MqeAUrUIk1djCAznN2qw=; b=FmWw8rxfAISxcVNdmm2PtJ2UtK2uvCv/e1eqFY23BbpabF230LrdlTI3rBG0VULH48 aOIOxGix23I3nmKtjv20SVRJwfU8KL97Cv1UK5/0KTl8jaXJ00aQwjUvPRtjSb8N5Q7N An6E6selxb3KRlGJiGSuDV2YLA7K5ZKgrI4AGA8h8p/pkpus3OJIvKE+h6Vm5bjL+wcA 6VeOXXbBqs07kCTq727Pljv3UjkOtpnLYL7lVatI4ALuaaN2HV69C9VNJ701tYX6rsAj MDhg0/PtMf2jwmZ95xRcvqkvmvbKNrquWM3adhmFwIn6JkZS7Z8NVCvMhMxAHGeOgg93 WYiQ== X-Gm-Message-State: AJcUukdWWrXCXVDgHsO4vPOZeMgjduki9C7Ye6bxFHqvqsov/2rgCxVx MrX2FckpjgkGA720R5JDtjF8d4kY X-Google-Smtp-Source: ALg8bN64t9EhCFoXKW/YBL0U/dEif93HK7/OGXz6+hqN2KY+AdD54u+TD10CW9APT/TkRX6apENl7Q== X-Received: by 2002:a17:906:51d4:: with SMTP id v20-v6mr13782258ejk.184.1547805016448; Fri, 18 Jan 2019 01:50:16 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id dc5-v6sm3869719ejb.53.2019.01.18.01.50.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 01:50:15 -0800 (PST) Date: Fri, 18 Jan 2019 01:50:15 -0800 (PST) X-Google-Original-Date: Fri, 18 Jan 2019 09:50:14 GMT Message-Id: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 0/1] built-in stash: fix segmentation fault when files were added with intent Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Paul-Sebastian Ungureanu , Junio C Hamano Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Git for Windows offered the built-in stash early: in v2.19.0 it was offered as an experimental option, and in v2.20.0 it was enabled by default. One corner case was identified [https://github.com/git-for-windows/git/issues/2006] and fixed [https://github.com/git-for-windows/git/pull/2008] in the meantime, and this contribution brings it to the Git mailing list (with a commit message that was "lightly edited for clarity", as they say). This patch applies on top of ps/stash-in-c. Granted, it fixes a regression in that patch series, but as Paul is busy with University, I would suggest accepting this bug fix on top, just this time, as if we had stash-in-c already in next. Matthew Kraai (1): stash: fix segmentation fault when files were added with intent builtin/stash.c | 3 ++- t/t3903-stash.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) base-commit: bec65d5b783ef5ce4c655c26ad8f25c04b001dd1 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-110%2Fdscho%2Fstash-ita-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-110/dscho/stash-ita-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/110