Re: bug? git format-patch -M -D then git am fails
Junio C Hamano venit, vidit, dixit 14.11.2012 00:22: Joe Perches j...@perches.com writes: I don't believe that reversibility is a really useful aspect of deletion patches when there are known git repositories involved. You can read reversibility as safety if you want. We would want to make sure we know what we are deleting before deleting a path. The history that the receiver of such a patch has may have further changes that are relevant that the sender of the deletion patch did not know about, and removing the path in such a case would make the result inconsistent. If the sender did his work on top of the newer version with the change in the path, the sender's patch may still have deleted the path but would have had changes to other paths to compensate for the loss of that change. Just in case someone wants to hack on this: To be safe, git am would need to read the blob's sha1 from something like diff --git a/Makefile b/Makefile deleted file mode 100644 index 1b6d84d..000 and check that the file to be deleted matches. Michael -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
bug? git format-patch -M -D then git am fails
If a file is deleted with git rm and a patch is then generated with git format-patch -M - -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
bug? git format-patch -M -D then git am fails
(Sorry about the partial message. evolution and ctrl-enter sends, grumble...) If a file is deleted with git rm and a patch is then generated with git format-patch -M -D git am is unable to apply the resultant patch. Is this working as designed? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: bug? git format-patch -M -D then git am fails
Joe Perches j...@perches.com writes: (Sorry about the partial message. evolution and ctrl-enter sends, grumble...) If a file is deleted with git rm and a patch is then generated with git format-patch -M -D git am is unable to apply the resultant patch. Is this working as designed? I would say it is broken as designed and it is even documented. Please run git format-patch --help | less and then type /--irreversible-delete to find: The resulting patch is not meant to be applied with patch nor git apply; this is solely for people who want to just concentrate on reviewing the text after the change. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: bug? git format-patch -M -D then git am fails
On Tue, 2012-11-13 at 14:55 -0800, Junio C Hamano wrote: Joe Perches j...@perches.com writes: (Sorry about the partial message. evolution and ctrl-enter sends, grumble...) If a file is deleted with git rm and a patch is then generated with git format-patch -M -D git am is unable to apply the resultant patch. Is this working as designed? I would say it is broken as designed and it is even documented. Please run git format-patch --help | less and then type /--irreversible-delete to find: The resulting patch is not meant to be applied with patch nor git apply; this is solely for people who want to just concentrate on reviewing the text after the change. yeah, it's just that not using -D can result in some unfortunately large patches being sent to mailing lists. I don't believe that reversibility is a really useful aspect of deletion patches when there are known git repositories involved. cheers, Joe -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
