Re: Another git question

[Dima K. <gn...@di...>]

Ethan A Merritt via gnuplot-beta <gnu...@li...> writes:

> The entire patch file containing this piece is rejected by "git apply"
> or "git am", apparently because it does not like the syntax "@@ -0,0"
> which diff/patch use to indicate "top of file".

-0,0 doesn't just indicate "top of file". It indicates that the file was
empty prior to this patch. Was that the case here?


> I can apply the patch manually using "patch" and then run "git commit",
> but this loses the commit message and author information that was in
> the original formatted patch.
>
> Is there some config option for "git am" and/or "git apply" that tells
> it to accept this syntax in a patch file?

Don't know off the top of my head. Generall 'git am' is used as the
complement to 'git format', but that's not what you're doing. If you
just did a 'git format' and then a 'git am' on the tree at the same
revision, it MUST work. Otherwise you found a bug. I'm wondering if an
empty ChangeLog file was committed when you did a 'git format', but no
ChangeLog was committed at all on your 'git am' side. Is that it?