On Thu, Oct 06, 2016 at 08:43:02AM -0400, Josef Ridky wrote: > This is the first of two variant for request to add option to change > suffix of name of temporary files generated by git mergetool. This > change is requested for cases, when is git mergetool used for local > comparision between two version of same package during package rebase. > > Signed-off-by: Josef Ridky <jri...@redhat.com> > --- > Documentation/git-mergetool.txt | 7 ++++++- > git-mergetool.sh | 23 ++++++++++++++++++----- > 2 files changed, 24 insertions(+), 6 deletions(-)
While I do like that this variant only uses a single flag, I was curious whether it would make sense for us to change our defaults to OLD/NEW? I'm thinking "no" since it's totally legit to merge "old" branches so I'll stop there. What I really wanted to mention was... If the patch does not update t/t7610-mergetool.sh then there is no guarantee that my clumsy fingers won't break the new feature in the future ;-) So please make sure to update the tests once we decide on the final direction. It makes sense we wouldn't want to update them just yet (in this patch) since this is still RFC, but the final one should include it. I'm still leaning towards environment variables personally, and would have no qualms against taking a patch that teaches it to support environment variables as long as it adds a test case for the new feature. Thanks for sticking with it, Josef! cheers, -- David
