Re: [PATCH v2 1/2] Add test to describe expectation of blame --reverse with branched history

2015-10-22 Thread Max Kirillov
On Wed, Oct 21, 2015 at 09:19:45PM -0700, Junio C Hamano wrote: > Let me try. > > (1) for merges, an edge with '*' denotes the one to the first > parent. > (2) a commit that touches file.t are in capital > >c1---a3 > /* > // >A0---a1--*a2 >

Re: [PATCH v2 1/2] Add test to describe expectation of blame --reverse with branched history

2015-10-22 Thread Max Kirillov
On Thu, Oct 22, 2015 at 05:37:21PM +0300, Max Kirillov wrote: > Yes. Though I would ... make the line of As straight. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: [PATCH v2 1/2] Add test to describe expectation of blame --reverse with branched history

2015-10-21 Thread Junio C Hamano
Max Kirillov writes: > If history contains merges from feature branches, `blame --reverse` > reports not the commit when the line was actually edited, but head of > the last merged branch which was created before the edit. > > As a workaround, `blame --reverse --first-parent`

[PATCH v2 1/2] Add test to describe expectation of blame --reverse with branched history

2015-10-21 Thread Max Kirillov
If history contains merges from feature branches, `blame --reverse` reports not the commit when the line was actually edited, but head of the last merged branch which was created before the edit. As a workaround, `blame --reverse --first-parent` could be used to find the merge of branch