From: David Kastrup Date: Tue, 14 Aug 2007 14:45:59 GMT Subject: Re: bisect / history preserving on rename + update Message-ID: <86lkcefa3c.fsf@lola.quinscape.zz> In-Reply-To: <1187101183.12828.191.camel@chaos> Thomas Gleixner writes: > On Tue, 2007-08-14 at 13:18 +0200, Karl Hasselström wrote: >> On 2007-08-14 13:06:59 +0200, Thomas Gleixner wrote: >> >> > On Tue, 2007-08-14 at 12:50 +0200, Karl Hasselström wrote: >> > >> > > The result is exactly the same. git-mv is just a convenience. >> > >> > Fair enough, but it still does not solve my initial problem of >> > keeping the history of B (former A) intact, while creating a new A >> > which is necessary to compile the tree, simply because I can not >> > change #include to #include for various reasons. >> >> Have you tried running blame with -C, or -C -C? That will make it try >> harder to identify lines originating from other files. > > Does not help. Strange enough it results in > > # git blame include/B > > b4062b16 include/A (Joe Hacker 2007-08-14 10:52:28 +0200 1) #ifndef _A_H_ > b4062b16 include/A (Joe Hacker 2007-08-14 10:52:28 +0200 2) #define _A_H_ > b4062b16 include/A (Joe Hacker 2007-08-14 10:52:28 +0200 3) > b4062b16 include/A (Joe Hacker 2007-08-14 10:52:28 +0200 4) #define TEST_1 1 > f098c4ad include/B (Thomas Gleixner 2007-08-14 16:01:05 +0200 5) #define TEST_2 2 > f098c4ad include/B (Thomas Gleixner 2007-08-14 16:01:05 +0200 6) > f098c4ad include/B (Thomas Gleixner 2007-08-14 16:01:05 +0200 7) #endif So it tells you commit and corresponding file that are responsible for the lines in question. How does this not help? -- David Kastrup