From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id AFD661F5AD for ; Thu, 9 Apr 2020 23:57:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbgDIX5U (ORCPT ); Thu, 9 Apr 2020 19:57:20 -0400 Received: from cloud.peff.net ([104.130.231.41]:38956 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1726779AbgDIX5U (ORCPT ); Thu, 9 Apr 2020 19:57:20 -0400 Received: (qmail 22738 invoked by uid 109); 9 Apr 2020 23:57:21 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Thu, 09 Apr 2020 23:57:21 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 24732 invoked by uid 111); 10 Apr 2020 00:07:51 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Thu, 09 Apr 2020 20:07:51 -0400 Authentication-Results: peff.net; auth=none Date: Thu, 9 Apr 2020 19:57:19 -0400 From: Jeff King To: Erwin Bonsma Cc: git@vger.kernel.org Subject: Re: Commit includes rename which was not staged, nor actually performed Message-ID: <20200409235719.GA46281@coredump.intra.peff.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Apr 08, 2020 at 09:28:09PM +0200, Erwin Bonsma wrote: > The branch includes the wrong commit. To reproduce it: > > git reset --soft HEAD~1 > > git restore --staged de.xliff > > git restore --staged Pending/it.xliff.todo > > git restore de.xliff There was a bug where git-restore didn't correctly invalidate the cache-tree extension of the index, and could cause phantom changes to end up in commits. It was fixed by e701bab3e9 (restore: invalidate cache-tree when removing entries with --staged, 2020-01-08), which is in v2.25.1 and up. -Peff