From mboxrd@z Thu Jan 1 00:00:00 1970 From: Phillip Susi Subject: Re: New directory lost by git am Date: Wed, 05 Mar 2014 09:26:43 -0500 Message-ID: <53173423.6050708@ubuntu.com> References: <531690A3.3040509@ubuntu.com> <53169549.10309@gmail.com> <53169868.3010401@ubuntu.com> <5316DBEC.3020208@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: Chris Packham , "git@vger.kernel.org" X-From: git-owner@vger.kernel.org Wed Mar 05 16:04:20 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WLDMi-0006RI-Q3 for gcvg-git-2@plane.gmane.org; Wed, 05 Mar 2014 16:04:13 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757902AbaCEPDh (ORCPT ); Wed, 5 Mar 2014 10:03:37 -0500 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:49852 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757491AbaCEO0o (ORCPT ); Wed, 5 Mar 2014 09:26:44 -0500 X-Authority-Analysis: v=2.0 cv=MODiabll c=1 sm=0 a=/DbS/tiKggfTkRRHPZEB4g==:17 a=JipEcVzqA9wA:10 a=JbtRu-yXPzkA:10 a=S1A5HrydsesA:10 a=Qsx_du5GiBkA:10 a=8nJEP1OIZ-IA:10 a=fxJcL_dCAAAA:8 a=KGjhK52YXX0A:10 a=QfKxxUxMAAAA:8 a=rMuWRI3sa89u0SwSGTMA:9 a=wPNLvfGTeEIA:10 a=/DbS/tiKggfTkRRHPZEB4g==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 67.78.168.186 Received: from [67.78.168.186] ([67.78.168.186:59915] helo=[10.1.1.236]) by cdptpa-oedge03.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id D6/DF-23887-12437135; Wed, 05 Mar 2014 14:26:41 +0000 User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 In-Reply-To: <5316DBEC.3020208@gmail.com> X-Enigmail-Version: 1.6 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 3/5/2014 3:10 AM, Chris Packham wrote: > My example is creating a commit on the "temp" branch then applying > it to the "master" branch using git am. > >> Do a reset HEAD~1 --hard, and git clean -x -f -d before git am. >> I didn't notice the missing file myself for some time because it >> is left in the working tree, just not added to the index and >> included in the commit. >> Right... so the file is left in the directory, even though it is not checked in. A git status should show it is an unknown file, and a clean should remove it. > Regardless of reproducing the issue a quick glance at the Release > notes for 1.8.3.3 the following sticks out: > > Fixes since v1.8.3.2 -------------------- > > * "git apply" parsed patches that add new files, generated by > programs other than Git, incorrectly. This is an old breakage in > v1.7.11. > > Does that sound like your problem? If you can I'd suggest > updating, ideally to the recent 1.9.0 release but if you're feeling > conservative try 1.8.3.4. Vaguely, except for the "other than git" part. This patch was generated by git-format-patch ( I didn't think apply handled patches that weren't ). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJTFzQiAAoJEI5FoCIzSKrwXEMH/iQdFdAApGnFCyLGA4l87d4M ITLtyL632gHA39KnlEqtTc6TgFjQMrV3m8s9TeR6DiEI9qGvNvnP2E4JBFORZprk RSJoCa9qMuAYOtSEtwrzbhMZpBN7hAZeJ7txP2KwZiGXoWjr4RSawjViQHhnXQEP L9QMmwjWJBwZE/eklYg8W+Ov987uribGTgOL8Wx1iMME2C88VfyCWtg1ClTz3aEh UeyAvyLxSA+YvS4xg+nUBAxXX8bFI0g53Yjf3Lt/1/EzdO67sH7CRChR67BmANWZ NBoxBqenN6/qg0rfRojOnjGTtRpAJX48dgnEHulUJrixrmqBYXAbi8dNVW8KkiM= =tzX5 -----END PGP SIGNATURE-----