From: David Aguilar Date: Tue, 10 Jan 2017 04:36:46 GMT Subject: Re: [PATCH 0/4] fix mergetool+rerere+subdir regression Message-ID: <20170110043646.qfwcn7d7klag7qtf@gmail.com> In-Reply-To: <20170104005042.51530-1-hansenr@google.com> On Tue, Jan 03, 2017 at 07:50:38PM -0500, Richard Hansen wrote: > If rerere is enabled, no pathnames are given, and mergetool is run > from a subdirectory, mergetool always prints "No files need merging". > Fix the bug. > > This regression was introduced in > 57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0). > > Richard Hansen (4): > t7610: update branch names to match test number > t7610: make tests more independent and debuggable > t7610: add test case for rerere+mergetool+subdir bug > mergetool: fix running in subdir when rerere enabled > > git-mergetool.sh | 1 + > t/t7610-mergetool.sh | 132 ++++++++++++++++++++++++++++++++++----------------- > 2 files changed, 90 insertions(+), 43 deletions(-) Thanks for finding these, this reminds me very much of the recent fixes that had to be done to difftool. I tested this so, Acked-by: David Aguilar -- David