mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: "Andreas Bießmann" <andreas.biessmann@corscience.de>
To: PTXdist list <ptxdist@pengutronix.de>
Subject: [ptxdist] [PATCH] ptxd_make_world_patchin.sh: overwrite global diff.renames git option
Date: Thu, 31 Jan 2013 11:46:05 +0100	[thread overview]
Message-ID: <1359629165-1931-1-git-send-email-andreas.biessmann@corscience.de> (raw)

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 &&
 	echo "patchin: git: done"
     fi
 }
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2013-01-31 10:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-31 10:46 Andreas Bießmann [this message]
2013-02-03 11:25 ` Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1359629165-1931-1-git-send-email-andreas.biessmann@corscience.de \
    --to=andreas.biessmann@corscience.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox