Re: [ptxdist] [PATCH] ptxd_make_world_patchin.sh: overwrite global diff.renames git option

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Thu, Jan 31, 2013 at 11:46:05AM +0100, Andreas Bießmann wrote:
> 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>
> ---
>  scripts/lib/ptxd_make_world_patchin.sh |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh
> index fc9dbfa..8f9bd42 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 &&

I think this is usually the default. But I suppose it can happen, that the
user changed it. I doesn't hurt, so I've just applied this.

Michael

>  	echo "patchin: git: done"
>      fi
>  }
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de