-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 03/04/2014 10:08 PM, Chris Packham wrote: > Could you provide a few more details such as your git version (git > --version) and an example of the failure. I've tried to reproduce > the problem based on the description provided but everything seems > to work as expected for me.
Version 1.8.3.2. > git --version git version 1.9.0 mkdir test && cd test && git init > echo "hello world" >a.txt git add a.txt git commit -m"Initial > commit" git checkout -b temp mkdir b echo "lorem ipsum" >b/b.txt > git add b/b.txt git commit -m"Add b/b.txt" ls -R .: a.txt b > > ./b: b.txt git checkout master git format-patch temp -1 --stdout | > git am ls -R .: a.txt b > > ./b: b.txt > You are reapplying the patch while it is already applied. 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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCgAGBQJTFphoAAoJEI5FoCIzSKrwx78H/iTLvtMVb2hmn2g2YDQuJWe3 nENrqlRNDF11YHpA9c7chxepcuP2CZaZjoXv45aCQG9Wx9XJyKPIbauhwqIIVUjR VYDORdtpn8u3Pf3WWyHYW+MEoupYyni4VYENVSjKnV6sLT951TuYI+4paHWat3lq /at9UkLy4d39hj2P/6M+voBbKWzblBZzP31lH6OY/Mno2zhh4eQChhsnZYPQ/Hfn REAeyB4WsLCjnPz+uEkOcWaEVVh+BwNU1UmK/tX+rzhBsaRzhDY5IIWTL9dfkD/z Af86IUSKdTjnMq7CTmVAmlxAfHXF0bgtlybrVY2Sdc8R/CqmWCz6USyKdUxgLIk= =Z3Z/ -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
