From: Phillip Susi <psusi@ubuntu•com>
To: Chris Packham <judge.packham@gmail•com>,
"git@vger•kernel.org" <git@vger•kernel.org>
Subject: Re: New directory lost by git am
Date: Tue, 04 Mar 2014 22:22:16 -0500 [thread overview]
Message-ID: <53169868.3010401@ubuntu.com> (raw)
In-Reply-To: <53169549.10309@gmail.com>
-----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-----
next prev parent reply other threads:[~2014-03-05 3:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-05 2:49 New directory lost by git am Phillip Susi
2014-03-05 3:08 ` Chris Packham
2014-03-05 3:22 ` Phillip Susi [this message]
2014-03-05 8:10 ` Chris Packham
2014-03-05 14:26 ` Phillip Susi
2014-03-05 16:34 ` Jeff King
2014-03-05 16:47 ` Phillip Susi
2014-03-05 17:13 ` Jeff King
2014-03-05 18:29 ` Phillip Susi
2014-03-05 19:10 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53169868.3010401@ubuntu.com \
--to=psusi@ubuntu$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=judge.packham@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox