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: Wed, 05 Mar 2014 09:26:43 -0500 [thread overview]
Message-ID: <53173423.6050708@ubuntu.com> (raw)
In-Reply-To: <5316DBEC.3020208@gmail.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-----
next prev parent reply other threads:[~2014-03-05 15:04 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
2014-03-05 8:10 ` Chris Packham
2014-03-05 14:26 ` Phillip Susi [this message]
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=53173423.6050708@ubuntu.com \
--to=psusi@ubuntu.com \
--cc=git@vger.kernel.org \
--cc=judge.packham@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).