diff options
author | Guille -bisho- <bisho@freedreams.org> | 2015-09-25 10:37:41 -0700 |
---|---|---|
committer | Guille -bisho- <bisho@freedreams.org> | 2015-09-25 10:37:41 -0700 |
commit | e4b2b919bb35d94d6dbcb5f7a31805788f2e335b (patch) | |
tree | 2c3b974cc9359ac147f17f8631f8bc5f83b778a7 /tests/diff/diff_helpers.c | |
parent | 588e28ebfd16dc030be3226e4bc2107cdbad67b4 (diff) | |
download | libgit2-e4b2b919bb35d94d6dbcb5f7a31805788f2e335b.tar.gz |
Fix binary diffs
git expects an empty line after the binary data:
literal X
...binary data...
<empty_line>
The last literal block of the generated patches were not containing the required empty line. Example:
diff --git a/binary_file b/binary_file
index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
GIT binary patch
literal 8
Pc${NM&PdElPvrst3ey5{
literal 6
Nc${NM%g@i}0ssZ|0lokL
diff --git a/binary_file2 b/binary_file2
index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
GIT binary patch
literal 8
Pc${NM&PdElPvrst3ey5{
literal 13
Sc${NMEKbZyOexL+Qd|HZV+4u-
git apply of that diff results in:
error: corrupt binary patch at line 9: diff --git a/binary_file2 b/binary_file2
fatal: patch with only garbage at line 10
The proper formating is:
diff --git a/binary_file b/binary_file
index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
GIT binary patch
literal 8
Pc${NM&PdElPvrst3ey5{
literal 6
Nc${NM%g@i}0ssZ|0lokL
diff --git a/binary_file2 b/binary_file2
index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
GIT binary patch
literal 8
Pc${NM&PdElPvrst3ey5{
literal 13
Sc${NMEKbZyOexL+Qd|HZV+4u-
Diffstat (limited to 'tests/diff/diff_helpers.c')
0 files changed, 0 insertions, 0 deletions