From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A6FA3198005 for ; Thu, 28 Feb 2013 13:17:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E662E077E; Thu, 28 Feb 2013 13:17:36 +0000 (UTC) Received: from vms173011pub.verizon.net (vms173011pub.verizon.net [206.46.173.11]) by pigeon.gentoo.org (Postfix) with ESMTP id B7640E0774 for ; Thu, 28 Feb 2013 13:17:35 +0000 (UTC) Received: from odin.tremily.us ([unknown] [72.68.84.219]) by vms173011.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MIX00GBBM8MFS80@vms173011.mailsrvcs.net> for gentoo-catalyst@lists.gentoo.org; Thu, 28 Feb 2013 07:17:12 -0600 (CST) Received: by odin.tremily.us (Postfix, from userid 1000) id B05B88CB6CF; Thu, 28 Feb 2013 08:17:10 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1362057430; bh=okjJMjZMfF4nIVUrfPufJ5JWCih/SwVkemzcc+3mNjs=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=gYu7D72dwbir/3mkORF8QDwfemkbIOilG2KeTloXGY0QAKeW6gUU40/0XHu/kVFsH H7YJI7u9ui5rsrhz8C40Z+s1AFoTotnlQ76l5qOeQmxtY+M4rMFAHVDJqfVkXcatGw HZ90C7QFMnHbNHoQKhTKkEUADgAlT7T6vkVM59Zs= Date: Thu, 28 Feb 2013 08:17:10 -0500 From: "W. Trevor King" To: gentoo-catalyst@lists.gentoo.org Cc: Brian Dolbec Subject: Re: [gentoo-catalyst] [PATCH 0/4] Some general cleanup, remove some hardcoding of paths. Message-id: <20130228131710.GA2872@odin.tremily.us> References: <1362016021-8338-1-git-send-email-dolsen@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-version: 1.0 Content-type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="W/nzBZO5zC0uMSeA" Content-disposition: inline In-reply-to: <1362016021-8338-1-git-send-email-dolsen@gentoo.org> OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8; url=http://tremily.us/pubkey.txt User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: d314b4b5-ff6d-4f9b-9ffe-bb5cb94dc468 X-Archives-Hash: c7e2993e71b46f50d782736f74138824 --W/nzBZO5zC0uMSeA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 27, 2013 at 05:46:57PM -0800, Brian Dolbec wrote: > There are several more bugfixes I feel shuld be applied to master if > you intend on releasing a bug fix version bump. They will have to > be applied manually since the file names and locations have changed > in the rewrite. Git records abbreviated blob SHAs in the diff: diff --git a/ChangeLog b/ChangeLog index 893cfec..12b41f2 100644 --- a/ChangeLog +++ b/ChangeLog which it can use to apply patches to files, even if the patched blobs have been renamed in a separate commit. You have to use the `--3way` option with `git am` to turn this functionality on, though. For example: $ mkdir test-repo $ cd test-repo $ git init $ echo 'hello world' > README $ git add README $ git commit -m 'README: create with dummy content' $ git mv README{,-b} $ git commit -am 'README-b: moved from README' $ echo 'goodbye world' >> README-b $ git commit -am 'README: edited' $ git format-patch HEAD^ $ git reset --hard HEAD^^ $ git am -3 *patch Works (even though we reset to before the rename), as we can see with: $ git --no-pager log --oneline c587719 README: edited ee5ec97 README: create with dummy content $ cat README hello world goodbye world However, the fact that Git *can* apply patches like this doesn't mean that it's a good idea ;). Cheers, Trevor --=20 This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy --W/nzBZO5zC0uMSeA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAEBAgAGBQJRL1jUAAoJEEUbTsx0l5OMPmYP/1Wiwm40opodnZiXmA8MO/yW TmeZsJCVkg8kqlUH6JS3UMa3ipf3gjNr78joJZpMa8KS3i2bNtsCiRiyenyOgpPY U6syQW4zPb3XeB4a3Zf0Np43RMcke26zke1L8eA64SiAxogZu8KzIMxQHENEkIeu bfpWdT/1uIoobMHaFgyDLMoPHIco0Kr2etf/53lwsKtW3jwPRTQJn7IMn750PkMb +o/bGAgQscpjxwZSVxBtH5fsTDQDMI0A+WPWVQ/FlaWExRwNGkkNFR28o+CIsdwM uAdEXvb/P0Ct2UP/zeFxrlzdHGCYSFnUu8MJKyOAgVOCcpBu8Z/tI0pmLXFYcKPr Og2xMM4eZq29Es5b/PEkqzMlRzEbyTPmugDRF3+Gpc77dGV5g+ouuf9m0/+fLduX jtlGGYKY8fSYmsr3aXk4jwnAxZB6Sh/5+DsSZRT50C6KzK5C2+8c29iNZdifTZH6 dh7OOwWcDXON06iqZ0msDl0fPG1AUnOjDNB5bu7eAPZm11naihU3RlcyQvu1gvQH 2c2nb7TGifWeX9cHVZdQhRmvf0hXepxDHMBofebggpTKG1gp5d9VWLhGbSBL8/Jw eXB6gVybY8xKbG6zgCUoNEzV2HM31IfzUlwtbYJasxoMD9aSrUuw6wkv8uuLlFjd eD9I5NDv8QflSowzCcMm =odr4 -----END PGP SIGNATURE----- --W/nzBZO5zC0uMSeA--