{"thread":{"id":"25034","subject":"git am cannot handle patches created with -B -M?","startedAt":"2010-09-08T13:00:00Z","lastAt":"2010-09-08T13:00:00Z","messageCount":1,"participants":["Geert Uytterhoeven"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"150292","messageId":"AANLkTinX=52AofapdhEmAZX3ergn-JKtTc5_3ZCa9G_0@mail.gmail.com","threadId":"25034","inReplyTo":null,"subject":"git am cannot handle patches created with -B -M?","fromName":"Geert Uytterhoeven","fromEmail":"geert@linux-m68k.org","sentAt":"2010-09-08T13:00:00Z","receivedAt":"2010-09-08T13:00:00Z","isPatch":false,"sender":{"key":"geert@linux-m68k.org","avatar":"https://gravatar.com/avatar/8105b34f653a7b5b98e225e565b11ebcc762ad4ab1a9d905a4663db029a9e6bc?d=mp&s=160"},"body":"Hi,\n\nI tried applying the patch in\nhttp://www.spinics.net/lists/linux-m68k/msg03012.html\nusing `git am', but it failed:\n\n| Applying: m68k/m68knommu: merge MMU and non-MMU string.h\n| error: arch/m68k/include/asm/string.h: already exists in index\n| Patch failed at 0001 m68k/m68knommu: merge MMU and non-MMU string.h\n| When you have resolved this problem run \"git am --resolved\".\n| If you would prefer to skip this patch, instead run \"git am --skip\".\n| To restore the original branch and stop patching run \"git am --abort\".\n\nAnd according to `git status' no files have conflicts??\n\nGreg said he created the patch using `git format-patch -M -B'.\n\nThe examples in the docs for format-patch say:\n\n|       ·   The same as the previous one:\n|\n|               $ git format-patch -M -B origin\n|\n|           Additionally, it detects and handles renames and complete rewrites\n|           intelligently to produce a renaming patch. A renaming patch reduces\n|           the amount of text output, and generally makes it easier to review.\n|           Note that non-git \"patch\" programs won't understand renaming\n|           patches, so use it only when you know the recipient uses git to\n|           apply your patch.\n\nso I'd expect `git am' to handle it.\n\nMy git is 1.7.0.4. Is this bug fixed in a later version?\n\nThanks in advance!\n\nGr{oetje,eeting}s,\n\n                        Geert\n\n--\nGeert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org\n\nIn personal conversations with technical people, I call myself a hacker. But\nwhen I'm talking to journalists I just say \"programmer\" or something like that.\n                                -- Linus Torvalds\n"}]}