Jeff King writes:
> But I have not thought hard about it, so maybe there is a good reason
> not to (it is a little weird just because the resulting index is a
> partial application of the patch).
Originally ".rej" was a deliberate attempt to be "not very Git but
more like 'patch'", so I wouldn't
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 3/5/2014 12:13 PM, Jeff King wrote:
> We apply the changes to "modified" and "new" to the working tree,
> but we do not stage anything in the index. I suspect this is
> because our invocation of "apply --index" (which is what is doing
> the real wor
On Wed, Mar 05, 2014 at 11:47:12AM -0500, Phillip Susi wrote:
> > I can't get Chris's script to fail on any version of git. Can you
> > show us an example of a patch that does not behave (or better yet,
> > a reproduction recipe to generate the patch with "format-patch")?
>
> AHA! It requires a
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 3/5/2014 11:34 AM, Jeff King wrote:
> I don't think those steps are necessary for Chris's example. When
> he switches back to the master branch, git removes the subdirectory
> (the file is tracked in "temp" but not "master", so we remove it
> when s
On Wed, Mar 05, 2014 at 09:26:43AM -0500, Phillip Susi wrote:
> -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 HEA
-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 missin
On 05/03/14 16:22, Phillip Susi wrote:
> 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
>>
-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 seem
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 su
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
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.
-BEGIN PGP SIGNATURE-
Version: GnuP
10 matches
Mail list logo
