Re: RFE: version-controlled merge rules

2018-12-29 Thread hpa
On December 28, 2018 6:35:23 AM PST, Junio C Hamano wrote: >Jonathan Nieder writes: > >> The main issue I see is that this would make it a little *too* easy >to >> run arbitrary code on the user's machine. Build systems often >already >> lead to that, but users are more familiar with the risks f

Re: RFE: version-controlled merge rules

2018-12-28 Thread Duy Nguyen
On Fri, Dec 28, 2018 at 4:46 PM H. Peter Anvin wrote: > > On 12/27/18 3:55 PM, Jonathan Nieder wrote: > > Hi, > > > > H. Peter Anvin wrote: > > > >> [merge "version"] > >> name = Version file merge driver > >> driver = sort -V -r %O %A %B | head -1 > %A.tmp.1 && mv -f > >> %A.tmp.

Re: RFE: version-controlled merge rules

2018-12-28 Thread Junio C Hamano
Jonathan Nieder writes: > The main issue I see is that this would make it a little *too* easy to > run arbitrary code on the user's machine. Build systems often already > lead to that, but users are more familiar with the risks for build > than for version control. > > See [1] for some related d

Re: RFE: version-controlled merge rules

2018-12-28 Thread Ævar Arnfjörð Bjarmason
On Thu, Dec 27 2018, H. Peter Anvin wrote: > Right now, merge rules can get selected in .gitattributes, which is > version-controlled. However, there does not appear to be any way to *define* > custom merge rules which is version controlled. > > There are a lot of different files which can benef

Re: RFE: version-controlled merge rules

2018-12-27 Thread H. Peter Anvin
On 12/27/18 3:55 PM, Jonathan Nieder wrote: > Hi, > > H. Peter Anvin wrote: > >> [merge "version"] >> name = Version file merge driver >> driver = sort -V -r %O %A %B | head -1 > %A.tmp.1 && mv -f %A.tmp.1 >> %A > [...] >> However, I can't even put this in .gitattributes, because

Re: RFE: version-controlled merge rules

2018-12-27 Thread Jonathan Nieder
Hi, H. Peter Anvin wrote: > [merge "version"] > name = Version file merge driver > driver = sort -V -r %O %A %B | head -1 > %A.tmp.1 && mv -f %A.tmp.1 %A [...] > However, I can't even put this in .gitattributes, because doing so would break > any user who *doesn't* have the previo

RFE: version-controlled merge rules

2018-12-27 Thread H. Peter Anvin
Right now, merge rules can get selected in .gitattributes, which is version-controlled. However, there does not appear to be any way to *define* custom merge rules which is version controlled. There are a lot of different files which can benefit from custom merge rules, especially ones that are in