diff options
| author | Andreas Bießmann <andreas.biessmann@corscience.de> | 2013-01-31 11:46:05 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-02-03 12:17:01 +0100 |
| commit | cd6524b62bd137c4e1ba2c25561ce42a1c2556f4 (patch) | |
| tree | 42cbe0f74fe67d8a25f10a7d46349c25e8e0bf1f /scripts/lib/ptxd_make_world_patchin.sh | |
| parent | 0ac556f6b55da4c9d41c5e191432ba51276a40eb (diff) | |
| download | ptxdist-cd6524b62bd137c4e1ba2c25561ce42a1c2556f4.tar.gz ptxdist-cd6524b62bd137c4e1ba2c25561ce42a1c2556f4.tar.xz | |
ptxd_make_world_patchin.sh: overwrite global diff.renames git option
When working with pure git work flow the git parameter diff.renames may save
space when sending patches or storing them.
However using a patch generated with this parameter in a mixed git/quilt/patch
work flow is useless cause quilt/patch can not work with this information,
they need explicit delete of lines and add of lines.
This patch change the local git configuration of an extracted package to force
the diff.renames parameter to false witch will overwrite a possible global
configuration.
Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_patchin.sh')
| -rw-r--r-- | scripts/lib/ptxd_make_world_patchin.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh index fc9dbfa57..8f9bd420f 100644 --- a/scripts/lib/ptxd_make_world_patchin.sh +++ b/scripts/lib/ptxd_make_world_patchin.sh @@ -65,6 +65,7 @@ ptxd_make_world_patchin_apply_git_init() git tag "${pkg_pkg//\~/-}" && git tag base && git config alias.ptx-patches "!${PTXDIST_TOPDIR}/scripts/git-ptx-patches \"\${@}\"" && + git config diff.renames false && echo "patchin: git: done" fi } |