From patchwork Sat Aug 8 07:49:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Raymond E. Pasco" X-Patchwork-Id: 11706273 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2733913B6 for ; Sat, 8 Aug 2020 07:50:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11C8120866 for ; Sat, 8 Aug 2020 07:50:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ameretat.dev header.i=@ameretat.dev header.b="tjSrvhqe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726248AbgHHHuf (ORCPT ); Sat, 8 Aug 2020 03:50:35 -0400 Received: from out0.migadu.com ([94.23.1.103]:3718 "EHLO out0.migadu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725764AbgHHHue (ORCPT ); Sat, 8 Aug 2020 03:50:34 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ameretat.dev; s=default; t=1596873033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FaAor5hXHvYzV53p8JhpPlcd7mgQJgyo8VMyzDiIJec=; b=tjSrvhqeaHH3hBX8R42YOKCA3fSmMExQsXwlUYFO/GMwV5AFHujDPEkPD1EyW5IqQHZSkl JTaIKw7pYAZTurOaJ7YYI5zX1Ji9WVsGRRsaeK/P2LBwRS4V1sX5KJQpTMf8IoKsxatj5M uTxDEnEgSd+OGfweLaxThX1yluh96Pg= From: "Raymond E. Pasco" To: Junio C Hamano Cc: git@vger.kernel.org, "Raymond E. Pasco" Subject: [PATCH v5 0/3] apply: handle i-t-a entries in index Date: Sat, 8 Aug 2020 03:49:56 -0400 Message-Id: <20200808074959.35943-1-ray@ameretat.dev> In-Reply-To: <20200806060119.74587-1-ray@ameretat.dev> References: <20200806060119.74587-1-ray@ameretat.dev> MIME-Version: 1.0 X-Spam-Score: 0.00 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org While testing the logic, I encountered some other issues, to be addressed in related patchsets. Raymond E. Pasco (3): apply: allow "new file" patches on i-t-a entries apply: make i-t-a entries never match worktree t4140: test apply with i-t-a paths apply.c | 25 ++++++++++++++++---- t/t4140-apply-ita.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-) create mode 100755 t/t4140-apply-ita.sh