From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10]
	ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1U1xh7-0006wR-JN
	for ptxdist@pengutronix.de; Sun, 03 Feb 2013 12:25:09 +0100
Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1U1xh7-0003hL-Ij
	for ptxdist@pengutronix.de; Sun, 03 Feb 2013 12:25:09 +0100
Date: Sun, 3 Feb 2013 12:25:09 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20130203112509.GM2408@pengutronix.de>
References: <1359629165-1931-1-git-send-email-andreas.biessmann@corscience.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1359629165-1931-1-git-send-email-andreas.biessmann@corscience.de>
Subject: Re: [ptxdist] [PATCH] ptxd_make_world_patchin.sh: overwrite global
 diff.renames git option
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

On Thu, Jan 31, 2013 at 11:46:05AM +0100, Andreas Bie=DFmann wrote:
> When working with pure git work flow the git parameter diff.renames may s=
ave
> 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=DFmann <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_ma=
ke_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-patche=
s \"\${@}\"" &&
> +	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