Re: New directory lost by git am

[Phillip Susi <psusi@ubuntu.com>]

-----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-----