Thread (5 messages) flat view 5 messages, 2 authors, 2016-06-15

Re: stgit truncates binary files to zero length when applying patches

From: Catalin Marinas <hidden>
Date: 2016-06-15 22:42:12

On 15/11/05, Karl Hasselström [off-list ref] wrote:
When applying patches and not fast-forwarding, stgit truncates the
binary files to zero length:
I've never tried binaries with StGIT before. When pushing a patch, if
a merge is needed (like in your case, the base of the foo patch has
changed), StGIT first tries "git-diff-tree | git-apply" for speed
reasons. If this fails, it falls back to a three-way merge.

Unfortunately, git-apply doesn't fail for patches including binary
files and simply creates an empty file. I think git-apply should be
changed to fail to apply this kind of patches.

--
Catalin
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help