On 7/26/06, Junio C Hamano <junkio@xxxxxxx> wrote:
Junio C Hamano <junkio@xxxxxxx> writes: > "Jon Smirl" <jonsmirl@xxxxxxxxx> writes: > >> git diff HEAD makes a much longer patch that deltas out the existing >> files and delta in the new file. >> >> It's applying patches in the extended git format that fails. > > Thanks. ... and it turns out that "git apply" (with or without --index) groks it just fine. I suspect the fix is quite recent (not in v1.4.2-rc1 but in v1.4.2-rc2).
I can confirm that git apply is handling this correctly with code from the current git tree. cogito is failing this case. -- Jon Smirl jonsmirl@xxxxxxxxx - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html