From: Chris Packham <judge.packham@gmail•com>
To: Phillip Susi <psusi@ubuntu•com>,
"git@vger•kernel.org" <git@vger•kernel.org>
Subject: Re: New directory lost by git am
Date: Wed, 05 Mar 2014 16:08:57 +1300 [thread overview]
Message-ID: <53169549.10309@gmail.com> (raw)
In-Reply-To: <531690A3.3040509@ubuntu.com>
Hi,
On 05/03/14 15:49, Phillip Susi wrote:
> I applied a patch with git am that adds a new source file to a new
> directory, and later noticed that file was missing from the commit.
> It seems that git am fails to add the new file/directory to the index.
>
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.
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
next prev parent reply other threads:[~2014-03-05 3:09 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 [this message]
2014-03-05 3:22 ` Phillip Susi
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=53169549.10309@gmail.com \
--to=judge.packham@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=psusi@ubuntu$(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