From 610569dc2e46b5398e2fec64266ffcf29354b223 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 13 Dec 2015 18:02:58 +0300 Subject: patch-tool-mxe: do not replace object id with 000 Previously patch-tool-mxe produced the following diffs: diff --git a/CMakeLists.txt b/CMakeLists.txt index 0000000..0000000 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt patch tool refused to apply this patch: The next patch would create the file CMakeLists.txt, which already exists! Assume -R? [n] This commit replaces 0000000..0000000 with 1111111..2222222. --- tools/patch-tool-mxe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 10fadfb..fdfa965 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -101,7 +101,7 @@ function export_patch { --stdout \ dist..HEAD | \ sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' | \ - sed 's/^index .......\.\......../index 0000000..0000000/' + sed 's/^index .......\.\......../index 1111111..2222222/' ) > $mxedir/src/${pkg}-${patch_name}.patch && \ echo "Generated ${mxedir}/src/${pkg}-${patch_name}.patch" } -- cgit v0.12