summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Nagaev <bnagaev@gmail.com>2015-12-13 15:02:58 (GMT)
committerBoris Nagaev <bnagaev@gmail.com>2015-12-13 15:02:58 (GMT)
commit610569dc2e46b5398e2fec64266ffcf29354b223 (patch)
treee7165daad030aa94a6a3d8d3d629ba0ab9b76cb3
parentde45bde5b9e30e125279f66d307646b1b7fefafd (diff)
downloadmxe-610569dc2e46b5398e2fec64266ffcf29354b223.zip
mxe-610569dc2e46b5398e2fec64266ffcf29354b223.tar.gz
mxe-610569dc2e46b5398e2fec64266ffcf29354b223.tar.bz2
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.
-rwxr-xr-xtools/patch-tool-mxe2
1 files changed, 1 insertions, 1 deletions
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"
}