From patchwork Tue Oct 26 15:11:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Ryan Hodges (rhodges)" X-Patchwork-Id: 12584993 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23C53C433F5 for ; Tue, 26 Oct 2021 15:18:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0950760C41 for ; Tue, 26 Oct 2021 15:18:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236194AbhJZPVM (ORCPT ); Tue, 26 Oct 2021 11:21:12 -0400 Received: from alln-iport-7.cisco.com ([173.37.142.94]:20505 "EHLO alln-iport-7.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235804AbhJZPVJ (ORCPT ); Tue, 26 Oct 2021 11:21:09 -0400 X-Greylist: delayed 425 seconds by postgrey-1.27 at vger.kernel.org; Tue, 26 Oct 2021 11:21:09 EDT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1864; q=dns/txt; s=iport; t=1635261525; x=1636471125; h=from:to:cc:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=mF5vORqAKsX5o3mRaFSxZ9T/pjeM6tuJEjxennE+ZXc=; b=dRlOBx8JXBZXe7elMtpdLZmunPLBbvTcmgDt269dI/qn//21kfP+HNbr YXxxr4t0mI4Bg841GBuQfKIJF4E2n55KIXUWBeXralrrnsfRw3U3NFCHI v7o5hjbUkEXeNMwXzZvJt6e5nDWqE/QMImDKBp9H45zzgxCupAPVaMi1I s=; X-IPAS-Result: A0DYAwCiGXhhl5xdJa1aHQEBPAEFBQECAQkBFYFZAoFPKSiBWDcxhEeDRwOFOaMGgS6BJQNUCwEBAQ0BARIvBAEBhQAZgjgCJTQJDgECBAEBAQEDAgMBAQEBBQEBBQEBAQIBBgQUAQEBAQEBAQGBCIVoAQyGRRYREQwBASkJBQERAQYcAiYCBDAVEgQOJ4JPglYDLwGRS482AYE6AoofeoExgQGCCAEBBgQEglGCORiCNQmBECoBgwWEF4J3hCkcgUlEgTwMEHmGcIMZN4IMIo8KAYIJLZVDR6kMCoMynngFLYNqkQeSLJYMH4Ignx8BhB0CBAIEBQIOAQEGgWE5gVtwFWUBgj4+ExkPjjmBDQEIgkOKXnQ4AgYBCgEBAwmSEl0BAQ IronPort-PHdr: A9a23:Otzbjxz91crjZYvXCzM3ngc9DxPP853qMQMPrJkqkbRDduKk5Zuxd EDc5PA4iljPUM2b7v9fkOPZvujmXnBI+peOtn0OMfkuHx8IgMkbhUosVciCD0CoMvHndWo5E d5EWVsj+Gu0YgBZHc/kbAjUpXu/pTcZBhT4M19zIeL4Uo7fhsi6zaa84ZrWNg5JnzG6J7h1K UbekA== IronPort-Data: A9a23:iGip7aDO68tAZBVW/zvjw5YqxClBgxIJ4kV8jS/XYbTApDt2hjMBn WQaWW3Qb/iNZzD8Lox0YInn9RsH6pCDyN5nOVdlrnsFo1CmBibm6XV1Cm+qYkt+++WaFBoPA /3z6bAsFehsJpPmjk/F3oPJ8D8sislkepKmULSdY3grG1c/IMscoUsLd9AR09YAbeeRW2thi fuqyyEIEAb4s9LcGjt8B5Or8HuDjtyr0N8rlgBWicRwgbPrvyJ94KTzik2GByCQroF8RoZWT gtYpV2z1juxExwFUrtJnltnG6EHaua6AOSAtpZZc4PysDEegQwf6/oQBPoYT0x1pRqCtd8kn b2htbToIesoFrfHlOJYWB5CHmQje6ZH47TAZ3O4tKR/zWWfLCCqmKooXRpwZNBGkgp0KTkmG fgwMjAKYh+OnMq9wamwTa9ngcFLwMzDY91P6ys+k2+AZRogaYvqX6nhu+dC4GpzmuBNXs2Pf 9BJYwM6OXwsZDUWagtIV/rShtyAnGH/dDFXpUm9qq8+4myVxwt0uJDiMcb9ZNOHX4NWk1yeq 2aA+H72aiz2L/SFwjaDt3mrnOKKwGXwWZkZE/uz8fsCbECvKnI7I00kfAecgdSA1mWOW9Z5I G461SEEov1nnKC0deXVUxq9qX+CmxcTXdtMDuE3gD1hLIKJvW514UBZE1Z8hMwaWNweHmZ7i gDT9z/9LXk+7uLNEy31GqK89GvqYUAowXk+iTjopOfvy+Piq4E6lB7USdAL/EWd0YCtSWiYL 9xnUEEDa1g7l8UH0eCw+krKxm/qrZnSRQlz7QLSNo5E0u+bTNP5D2BLwQGGhRqlEGp/ZgLd1 JTjs5PChN3i9bnXyESwrBwlRdlFHcqtPjzGmkJIFJI87Tmr8HPLVdkOu2wndBk3aphdJWeBj KrvVeV5uc870JyCMP8fXm5NI5hCIVXITI68DamEMrKinLAoKVPclM2RWaJg9zm9zBdz+U3OE Zyaas2rRW0LErhqySHeegvu+eFD+8zK/kuKHcqT503+idK2PSfJIZ9YYQDmRr1os8us/l6Pm /4BbJTi9vmqeLCnCsUh2dVLfQ5iwLlSLc2elvG7gcbZclY6QTp6W6GKqV7jEqQ895loei7z1 inVcidlJJDX3hUr9S3ihqhfVY7S IronPort-HdrOrdr: A9a23:Jx8pPa1x9vfGvKh7dzZbsAqjBRZyeYIsimQD101hICG9Lfb4qy n+ppomPEHP5wr5AEtQ5OxpOMG7MBThHQYc2/heAV7QZnibhILOFvAi0WKC+UyuJ8SazI5gPM hbAtND4bHLfD1HZKXBkUmF+rQbsaO6GcmT7I+0pRoAPGIaCZ2IhD0JbDpzZ3cGPDWucqBJba Z0iPA3wwaISDAyVICWF3MFV+/Mq5ngj5T9eyMLABYh9U2nkS6owKSSKWna4j4uFxd0hZsy+2 nMlAL0oo+5teug9xPa32jPq7xLhdrazMdZDsDksLlWFtyssHfsWG1SYczEgNkHmpDo1L/sqq iUn/4UBbU215oWRBDsnfKi4Xi67N9k0Q6c9bbRuwqcnSW+fkNhNyKE7rgpLicwLCEbzYxBOe twrhKknosSAhXakCvn4d/UExlsi0qvuHIn1fUelnpFTOIlGfVsRRx2xjIlLH4sJlOz1GkcKp gkMCgc3ocjTXqKK3TC+mV/yt2lWXo+Wh+AX0gZo8SQlzxbhmpwwUcUzNEW2i5ozuNwd7BUo+ Dfdqh4nrBHScEbKap7GecaWMOyTmjAWwjFPm6eKUnuUKsHJ3XOoZjq56hd3pDmRLUYiJ8p3J jRWlJRsmA/P0roFM2VxZVOtgvARW2sNA6dg/22J6IJzIEUaICbQxFreWpe5PdI+c9vcfEzc8 zDTa5rPw== X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="5.87,184,1631577600"; d="scan'208";a="768926661" Received: from rcdn-core-5.cisco.com ([173.37.93.156]) by alln-iport-7.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 26 Oct 2021 15:11:38 +0000 Received: from mail.cisco.com (xbe-rcd-004.cisco.com [173.37.102.19]) by rcdn-core-5.cisco.com (8.15.2/8.15.2) with ESMTPS id 19QFBcmm016535 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=OK); Tue, 26 Oct 2021 15:11:38 GMT Received: from xfe-aln-002.cisco.com (173.37.135.122) by xbe-rcd-004.cisco.com (173.37.102.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Tue, 26 Oct 2021 10:11:38 -0500 Received: from xfe-rcd-001.cisco.com (173.37.227.249) by xfe-aln-002.cisco.com (173.37.135.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Tue, 26 Oct 2021 10:11:37 -0500 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (72.163.14.9) by xfe-rcd-001.cisco.com (173.37.227.249) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15 via Frontend Transport; Tue, 26 Oct 2021 10:11:37 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hpH6Q6chuSVSfIc3gcsBQnL6Ujo9BaE/MumvqaQD4YpO60suWCcOhsYcVN73CeXccI5yznQfd1N8VQHNRdm+Wa3cGVdBFyeCuqS1EDlbDg8qAsrcQAi+yYmuDCDlUSTzCaeZkHmMWgvAkdMokJYpb0Dco3EPMPLHV4S2CuW0/TYl8pjU7HZ8LX7Hpkpnw6w3AmcfncP4j6C5CWnSoSZvNkf3uMvx8+2HVk6QMxw8UVYRRU3pkmHoaoTQNTlAWaCunWh/xpP1lE+t1Dz5st3ahxSfMYvq6niun4xZhrmp1JewVqlkJPi1YlwEs7zyIYej9BsFIZQTGFLkU/bfTb++QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mF5vORqAKsX5o3mRaFSxZ9T/pjeM6tuJEjxennE+ZXc=; b=BcwWDnOtSt7rMvdp8rB/OnGfLVJ7zJygArKrdBeZTMAHhwD/W28Wq2F1FlEsFjNcyqXmkH+HUcqMeNcFTv9kr6RJNqdxvK9mKpCJ8E9x++Ky0EQApmLKoTcNLtJIjPmKyLTucgWKhgFXin0cil/2wouI5dlBM8+68jbwXQCEJfpfGH+hGwpOADNpH8fycqHMmAuLZstLkG2+wwXHtUW/y46PwuezqIMbPLqrliWGQQmoRLr31xnZojkCwh04T4uCOFzujQEPZFQsW4gwpxrLQoXTy/FKJiZPI74DC35j8eHd41FGN1RrHPFRcaG+kpTnmdZlFlfrDl+Zi9YJacO4WA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cisco.com; dmarc=pass action=none header.from=cisco.com; dkim=pass header.d=cisco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.onmicrosoft.com; s=selector2-cisco-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mF5vORqAKsX5o3mRaFSxZ9T/pjeM6tuJEjxennE+ZXc=; b=sYqVrDy2fBZt87P7Rskl/+IzdGPRHWG6XOG8qTdTffzaPbZ6gmDdunBw75oRagi73F1wqaLW5SMbmHO2gcezgDLE2Osc3u2WKKKkDS9B0chAKURCkt3LH8+To29Z5DhxUb1821prRf2ctOepderwwo5orat55+MD/hcxBkF4Mi8= Received: from BY5PR11MB4072.namprd11.prod.outlook.com (2603:10b6:a03:18f::11) by BY5PR11MB3877.namprd11.prod.outlook.com (2603:10b6:a03:186::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16; Tue, 26 Oct 2021 15:11:36 +0000 Received: from BY5PR11MB4072.namprd11.prod.outlook.com ([fe80::8ac:6ba5:3e36:48cd]) by BY5PR11MB4072.namprd11.prod.outlook.com ([fe80::8ac:6ba5:3e36:48cd%5]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 15:11:36 +0000 From: "Ryan Hodges (rhodges)" To: "git@vger.kernel.org" CC: Ryan Hodges Subject: git apply --indent-to-add deletes other files from the index Thread-Topic: git apply --indent-to-add deletes other files from the index Thread-Index: AQHXynvEQ3cmWcCZkE2s8lirVrR3Xw== Date: Tue, 26 Oct 2021 15:11:36 +0000 Message-ID: <0DB10E05-094D-4382-AD1F-657878B06A80@cisco.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Apple Mail (2.3654.120.0.1.13) authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=cisco.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 31138d00-85a7-4187-66a9-08d99892e766 x-ms-traffictypediagnostic: BY5PR11MB3877: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1r1Ua/Y8HVfOS7UO2VvPGJ5Exav2Ejnuu5IPktAgDiWZV5ReQ/P71qN8jQyHnNjKXkUy/Em1gsTBlhH9DJhycfyH/wR6OtatVR8Z4/RjMMds6YR7qE3GnbgaZJkX9nl0/PEmM1v2DYtt1yE5eN8syiJVAO/VfQ25UgBz7huP5JU66zck07guJuWMSfrSnpE2xqUKf7NIjwhf7D2Osc/CMqe4PBRTO1l6QsUrbAcrukACz1AVU8QonYVjwIMbi+a+RXF80PNC7vdnbMPGIIj1513BNEp0BNSm83kObjU2SjdtnGLyaaP1Szg6UMKH9RhqaldeJwn++ece7xtEu0PkCkDoOvUa3VXmipzuRdQ6UydLrvExehmhnIkASd8JsJj7sHtHutucS53g9ySJVMhZhPpijQ8Po8OmIXVvRMtd8f4XLX08WsBp6x7QbbejO6dtKRTGAnNknbvIqTm+7OD+032CnwS/644ejZdM0xC0dr0pi68RiERwq3od8vSS+XFtGen6DgcpK8ETlp14BvuSnV1RnrbXcyGMBfuyd8nZmn8Cj6TYaDFsrw7TDa3KMKSrvyH0so4XaCHOZS+8R9ok9jE9WBF6Vtg/evTT/OlYYQD7NCZ1uA71r9pIKGaatOIWHWN7YB/kM5fshCudxpWj6dFolWnUnexO7vGG9Kizpf7SGnen7Cv/TwqSLGGrElAmBJso8YttcduJf95TjqKfe9acqIxn1IfvusOolSmGYok= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB4072.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(2906002)(8676002)(33656002)(8936002)(2616005)(6512007)(316002)(86362001)(71200400001)(66446008)(6506007)(83380400001)(66476007)(66556008)(122000001)(6486002)(76116006)(5660300002)(66946007)(4326008)(38100700002)(64756008)(36756003)(38070700005)(6916009)(508600001)(26005)(186003)(45980500001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?/nQzB1yCyfakVFocmQLG+325ZVKT?= =?utf-8?q?irKIAw3vBgZMOOV+0NUZK3TDZduxgyHa+OU9FJpnA1zLXFiqnEoZpQ3SuGTkhZkkk?= =?utf-8?q?yLwtl00cZBQa27E7uro/rzIxMjlPPQZfYqozoRBZgn8k/Gvkr+Jay8aDXM0WoBud3?= =?utf-8?q?pD09DPSrsCSv83/c6AgDP82Xc+5Mqe90MJuMoQgy2cGvCX3JqWvttmjgMye5gkYEL?= =?utf-8?q?Ol7nnA+IWJ25wI/92LIJIO/MneER43Kc4U+d/5NWdy3YKzXlZf3p/1BKrXiV5i+T0?= =?utf-8?q?ANDPc9i4i4HtVeqVfGWQY45mAIN0al72+cMeMV0CeU+tiUFGBgllvCSvzYqz4qA6Q?= =?utf-8?q?rJXhMi8tcnj+Ne8JzCDfrS5czByCTrUsT5j8TbplzcEb0frw++wod1mWIsetSrzQ+?= =?utf-8?q?91frnS/Zs5lhb59P4KwFQ2L1So/IVPTvavK5baTDdV3t7M7PHeRsfa8Sc6Bf0iccV?= =?utf-8?q?gjfkSkhTLGrWXMtq8qjIrpEP7+PQ5tkDa0SpNXW4NlIvMtVhGqCjNizy3SeClk3EU?= =?utf-8?q?xwtsk1GdBkMFxHtd290jqkRj5oowfsKJhRrgxhkMuKTim7Jcq6/y7x+5L7rjyNavS?= =?utf-8?q?VPY9gCRIqH3JX4mjijrMC11Io54kAcZY5N4byZBQ/Nkdly6hXzLfl03q1BIGQTylq?= =?utf-8?q?7fcfGnNWjOzJ1ghQ4aFWZG5MpETtA4ICdHFALNaw0r3Yv6vfMDzyD8hQ44KHBwPwt?= =?utf-8?q?ncpBkWU4wz5yr3ybNtsAEuBYwqBRA8RIZ9qnESsncoTqF0Sp2VObouLmhSzyH3nz4?= =?utf-8?q?+QxpgYiYv1WRPb6xgYJvzbtVEVsHXD7uLdNL2jovCgH2k2WjFfgHPIA5zHsjpybkp?= =?utf-8?q?MyQ4qxoBnckHnBO2Fkyit3ETktqaiUo8sjicY2BaAUQ+38WbYi//DTEB372ynuOn2?= =?utf-8?q?dr3xt7i0CBg5UjmFpplvGY7ZVKhWoeGEHpkfXpOYdQ2lINjSTEEBSHKRde+usuJ3I?= =?utf-8?q?wm6/0KQp4BII7CFiaSd/k/ZaI1p4TYamm2z2KKOCUq30vol/pZ5umcjKFFw/BYflT?= =?utf-8?q?LzljlIat/Agrv+KREL+wRyNiGpVtgQchQw4JwA30VSQN6kycIcYBu14yTQuhmlxTf?= =?utf-8?q?aq/FU1pJi/F0k49UWkkAq879C0s20Ju0PLjf4dga4ThCcD5gHj3dc6SwTjYplRsP7?= =?utf-8?q?isqlsrEb+Q3wIUw+KcoRrEDlNdZJySCax/WJ9bljS+BgnY6tuJq9HKE/of/ZAV15H?= =?utf-8?q?LgAA2sVBO0wWWBVicShuePxdHKaJQgDSwe8aD48qDZWM9cY5tiJHKCaGUc8jgDrkl?= =?utf-8?q?BRGKD+AncI4fssTVtXUbLA7MEj1nHqoVDes2wztgKji2AddMJOn1AxMrAamTj1WAh?= =?utf-8?q?ABISHfMflHCd7zCqIJaOffPMaw0kElvanDwUzhI7GtjSGjWbxgmIsekqr4kv9D0Pn?= =?utf-8?q?MdIu1TWtSbVDhIIQi6SdutEuXkz3FkEBdl41DPLeqbVUT8vGYAHr23VcyfkYnUI5w?= =?utf-8?q?AQRLFrGszfl7gw81xAZC6B/x6RXfyJ6eDxKwdRZbHH8OavnG3XWFqOkeRQh+f8bz1?= =?utf-8?q?PwijBVTNwnnL7iY716fp6gS0dnW7Cttf1klcRo9HPLQNHfCvGuxAXIU=3D?= Content-ID: <926AFD9120BA0C4EA4507C61A6A08E32@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB4072.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31138d00-85a7-4187-66a9-08d99892e766 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Oct 2021 15:11:36.3511 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5ae1af62-9505-4097-a69a-c1553ef7840e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: iJZFXse3gs4Z5vk9s3aQ/3is2Gr1N7qD9uCIPpC+XJCo0SJPmi7Q0jiWbxm7UpMG/3Mt0w8l9E1B5ubtFBc5MA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB3877 X-OriginatorOrg: cisco.com X-Outbound-SMTP-Client: 173.37.102.19, xbe-rcd-004.cisco.com X-Outbound-Node: rcdn-core-5.cisco.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi all, I’ve got a quick question about ‘git apply –intent-to-add’. If I’ve got a patch that just adds one file to the tree: [sjc-ads-2565:t.git]$ git diff and I apply that patch with –intent-to-add: [sjc-ads-2565:t.git]$ git apply --intent-to-add c.diff The newly added file is tracked but other files in the tree get marked as deleted: [sjc-ads-2565:t.git]$ git status On branch master Changes to be committed: (use “git restore –staged …” to unstage) deleted: a.c deleted: b.c Changes not staged for commit: (use “git add …” to update what will be committed) (use “git restore …” to discard changes in working directory) new file: c.c It looks like Git created a new index with only the newly added file in the patch. However, I’d like Git to just add one entry to the index corresponding to the newly added file in the patch. Is this a bug or am I completely misinterpreting the goal of ‘intent-to-add’. I just started looking at the source but a quick message from the experts would be much appreciated. I’m currently testing with Git version 2.33. Regards, Ryan diff --git a/c.c b/c.c new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/c.c @@ -0,0 +1 @@ +test