Re: git log fails to show all changes for a file

From: Andreas Schwab <schwab@linux-m68k.org>
Date: Jul 14, 2015, 17:54 UTC
Message-ID: <87615maam6.fsf@igel.home>
In-Reply-To: <20150714075955.GA24577@aepfle.de>

Olaf Hering <olaf@aepfle.de> writes:

Show 8 quoted lines

> On Tue, Jul 14, John Keeping wrote:
>
>> It was added in an evil merge (f9da455b93f6ba076935b4ef4589f61e529ae046),
>> try:
>> 
>> 	git log -p -M --stat --cc -- drivers/hv/channel_mgmt.c
>
> Thanks. Thats rather useless output...

Why do you think this is useless?

Show 7 quoted lines

> @@@ -404,7 -365,7 +404,7 @@@ static u32  next_vp
>    * performance critical channels (IDE, SCSI and Network) will be uniformly
>    * distributed across all available CPUs.
>    */
> - static void init_vp_index(struct vmbus_channel *channel, uuid_le *type_guid)
>  -static u32 get_vp_index(const uuid_le *type_guid)
> ++static void init_vp_index(struct vmbus_channel *channel, const uuid_le *type_guid)

One branch renamed get_vp_index to init_vp_index, the other branch added the const attribute. This hunk combines both changes.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."