Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-10 Thread Junio C Hamano
Christian Couder writes: > From: Junio C Hamano > Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore > conflict lines > Date: Mon, 10 Nov 2014 09:49:34 -0800 > >> Christian Couder writes: >> >>> Make sure we look for trailers before

Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-10 Thread Christian Couder
From: Junio C Hamano Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines Date: Mon, 10 Nov 2014 09:49:34 -0800 > Christian Couder writes: > >> Make sure we look for trailers before any conflict line >> by reusing the ignore_non_

Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-10 Thread Junio C Hamano
Christian Couder writes: > Make sure we look for trailers before any conflict line > by reusing the ignore_non_trailer() function. > > Helped-by: Junio C Hamano > Signed-off-by: Christian Couder > --- It makes sense to unify the logic to decide where the trailer block is, I would think. I how

[PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-09 Thread Christian Couder
Make sure we look for trailers before any conflict line by reusing the ignore_non_trailer() function. Helped-by: Junio C Hamano Signed-off-by: Christian Couder --- t/t7513-interpret-trailers.sh | 2 ++ trailer.c | 32 +--- 2 files changed, 27 ins