From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_DKIM_INVALID, T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 375C21F404 for ; Thu, 15 Feb 2018 18:02:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1165937AbeBOSCE (ORCPT ); Thu, 15 Feb 2018 13:02:04 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:51772 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1165818AbeBOSCD (ORCPT ); Thu, 15 Feb 2018 13:02:03 -0500 Received: by mail-wm0-f65.google.com with SMTP id r71so2472515wmd.1 for ; Thu, 15 Feb 2018 10:02:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=JYpfVEJw7YsNqJYjI+w9VjQnMmqBMBlHJQW42ccT9fU=; b=Oc88QdCRayIbbWEa0tzkrjSv4hCHJuSQ5pqu4ycNoL1YfO94AFQll2TeGb8KVmhFNc zbeFOEMB6XKYdVtwHxl5sIvWnX4Vwm0/E8rtP1M7C/I0LHuey8C+ZaSTriRHM2Bq40ea fNBVFoRZGWxEnrvJ/mi/CEq4Kq4yWc43ymNDUKXBZbKReAh3aqPoPigr6c4qL9zTsKaN +7OzqQ1Wtozktb+xgYQW/oLOCDwJRE7zUm4D3eMuBWzLy5OX2+pOLl45dVzdfaBZLL9l H60OUS8/pyFfdgnEvSlwC32POaCyn09rf3dXTTO1iGkADmcYiv1YkqjykPUO0r8EqD/T C6IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:references:date :in-reply-to:message-id:user-agent:mime-version; bh=JYpfVEJw7YsNqJYjI+w9VjQnMmqBMBlHJQW42ccT9fU=; b=IB8BLQK+Ztwy3Ujl5DFFqEh4k4dD/kGdgCxWQy0ngka8cbk4Q3bT7iAjoDUgNpJDN4 rsIZJuSDxS37WGrxcfqh4CBrjM4i7PROX4QY8iuGVTmmejpwu9D8hpdYMSyTKu7nYXEY mscISSO2a9MCCT2MF6xHtwGHP9UJcFdcNEv8EgyECS+AP+jS0kg4Hh8ft7AIzJOLyZGO m/Sgb9cquTOSv1pDDzrTmPXCi4iZNw2iQIRtb9mVgYVPTltwz4GEfFK2uo+sdnL3g8vf Wgs/xwKABfDh3qIQ4HfF+ZDAX22BfKbY6S4AZZMtpYWoB+vxrpoDony77g63i86udnIn ORDA== X-Gm-Message-State: APf1xPC42BhBac3I9oGnBwBYvCQ6xES6zJFqzuqUfc73A4/qehdLmGjz c5EHt0GfpJc/mviru24YPlQ= X-Google-Smtp-Source: AH8x226TVEl/kcfi7TyR7Fi1bxDE46PvTb1bHfRR0hLuFcCTCSBu9xHi1xJ1aeWw9SnYXb8cF2u9YQ== X-Received: by 10.28.148.150 with SMTP id w144mr2819553wmd.0.1518717721391; Thu, 15 Feb 2018 10:02:01 -0800 (PST) Received: from localhost (112.68.155.104.bc.googleusercontent.com. [104.155.68.112]) by smtp.gmail.com with ESMTPSA id 7sm16807697wmq.42.2018.02.15.10.01.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2018 10:01:59 -0800 (PST) From: Junio C Hamano To: Johannes Schindelin Cc: git@vger.kernel.org, Tatyana Krasnukha Subject: Re: [PATCH 2/2] apply: handle Subversion diffs with /dev/null gracefully References: <7858c01a2c92a55f86611335bbdcc93c94bc69d2.1518654532.git.johannes.schindelin@gmx.de> Date: Thu, 15 Feb 2018 10:01:58 -0800 In-Reply-To: <7858c01a2c92a55f86611335bbdcc93c94bc69d2.1518654532.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Thu, 15 Feb 2018 01:29:34 +0100 (STD)") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Johannes Schindelin writes: > } else { > - if (!starts_with(line, "/dev/null\n")) > + if (!is_dev_null(line)) > return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr); > } Yup. This seems to be the last explicit/manual check with the string "/dev/null" (instead of using is_dev_null(), which is how it should be and already is done in codepaths that guesses -p value and decides if it is a creation or a deletion patch). Looks good. Will queue. > diff --git a/t/t4135-apply-weird-filenames.sh b/t/t4135-apply-weird-filenames.sh > index b14b8085786..c7c688fcc4b 100755 > --- a/t/t4135-apply-weird-filenames.sh > +++ b/t/t4135-apply-weird-filenames.sh > @@ -100,7 +100,7 @@ deleted file mode 100644 > - > EOF > > -test_expect_failure 'apply handles a diff generated by Subversion' ' > +test_expect_success 'apply handles a diff generated by Subversion' ' > >Makefile && > git apply -p2 diff-from-svn && > test_path_is_missing Makefile