# Feature request: Reduce amount of diff in patch 4 messages from 2017-11-28 to 2017-12-07. Participants: KES, Kaartic Sivaraam, Stefan Beller, Junio C Hamano. Thread: https://gitlist.dev/t/47333 ## KES, 2017-11-28 16:09 Subject: Feature request: Reduce amount of diff in patch Message-ID: <372261511885370@web21o.yandex.ru> URL: https://gitlist.dev/e/372261511885370%40web21o.yandex.ru ``` Hi. I get often patches which can be minimized: @@ -60,11 +64,8 @@ sub _get_filter { address => { -like => \[ '?', "%$search%" ] }, company => { -like => \[ '?', "%$search%" ] }, country_code => { '=' => \[ 'UPPER(?)' => $search ] }, - ]); - $users = $users->search( $filter, { - prefetch => { Packages => { Ips => { Subnet => { Server => 'Locality' }}}}, - }); + ]); return $users; This patch can be minimized to: @@ -60,11 +64,8 @@ sub _get_filter { address => { -like => \[ '?', "%$search%" ] }, company => { -like => \[ '?', "%$search%" ] }, country_code => { '=' => \[ 'UPPER(?)' => $search ] }, ]); - $users = $users->search( $filter, { - prefetch => { Packages => { Ips => { Subnet => { Server => 'Locality' }}}}, - }); return $users; May you please fix the git to generate minimized patches? Thank you ``` ## Kaartic Sivaraam, 2017-11-28 17:24 Subject: Re: Feature request: Reduce amount of diff in patch Message-ID: <1511889885.16420.3.camel@gmail.com> URL: https://gitlist.dev/e/1511889885.16420.3.camel%40gmail.com In-Reply-To: <372261511885370@web21o.yandex.ru> ``` On Tue, 2017-11-28 at 18:09 +0200, KES wrote: > Hi. > > I get often patches which can be minimized: > I guess the one below can't be (see below). > @@ -60,11 +64,8 @@ sub _get_filter { > address => { -like => \[ '?', "%$search%" ] }, > company => { -like => \[ '?', "%$search%" ] }, > country_code => { '=' => \[ 'UPPER(?)' => $search ] }, > - ]); > > - $users = $users->search( $filter, { > - prefetch => { Packages => { Ips => { Subnet => { Server => 'Locality' }}}}, > - }); > + ]); > > > return $users; > > This patch can be minimized to: > > @@ -60,11 +64,8 @@ sub _get_filter { > address => { -like => \[ '?', "%$search%" ] }, > company => { -like => \[ '?', "%$search%" ] }, > country_code => { '=' => \[ 'UPPER(?)' => $search ] }, > ]); > > - $users = $users->search( $filter, { > - prefetch => { Packages => { Ips => { Subnet => { Server => 'Locality' }}}}, > - }); > > > return $users; > > May you please fix the git to generate minimized patches? > You seemed to have overlooked the empty line above the ']);' in the original patch. So, your minimized version isn't actually equivalent to the original one. Further, when trying to recreate your patch I get the following, diff --git a/diff-test b/diff-test index 1d5dc1b..f3ec38f 100644 --- a/diff-test +++ b/diff-test @@ -1,10 +1,8 @@ address => { -like => \[ '?', "%$search%" ] }, company => { -like => \[ '?', "%$search%" ] }, country_code => { '=' => \[ 'UPPER(?)' => $search ] }, + ]); - $users = $users->search( $filter, { - prefetch => { Packages => { Ips => { Subnet => { Server => 'Locality' }}}}, - }); return $users; I use git built from the source (2.15.0.531.g2ccb3012c) -- Kaartic ``` ## Stefan Beller, 2017-12-07 20:13 Subject: Re: Feature request: Reduce amount of diff in patch Message-ID: URL: https://gitlist.dev/e/CAGZ79kZt7hysp9Yzj8%3D%3Dnz9FAu3V4KduG9kH2KxhdEK5CTBiqA%40mail.gmail.com In-Reply-To: <372261511885370@web21o.yandex.ru> ``` On Tue, Nov 28, 2017 at 8:09 AM, KES wrote: > Hi. > > I get often patches which can be minimized: > > @@ -60,11 +64,8 @@ sub _get_filter { > address => { -like => \[ '?', "%$search%" ] }, > company => { -like => \[ '?', "%$search%" ] }, > country_code => { '=' => \[ 'UPPER(?)' => $search ] }, > - ]); > > - $users = $users->search( $filter, { > - prefetch => { Packages => { Ips => { Subnet => { Server => 'Locality' }}}}, > - }); > + ]); > > > return $users; > > This patch can be minimized to: > > @@ -60,11 +64,8 @@ sub _get_filter { > address => { -like => \[ '?', "%$search%" ] }, > company => { -like => \[ '?', "%$search%" ] }, > country_code => { '=' => \[ 'UPPER(?)' => $search ] }, > ]); > > - $users = $users->search( $filter, { > - prefetch => { Packages => { Ips => { Subnet => { Server => 'Locality' }}}}, > - }); > > > return $users; > > May you please fix the git to generate minimized patches? You can use a different diff algorithm. --diff-algorithm={patience|minimal|histogram|myers} Choose a diff algorithm. The variants are as follows: default, myers The basic greedy diff algorithm. Currently, this is the default. minimal Spend extra time to make sure the smallest possible diff is produced. patience Use "patience diff" algorithm when generating patches. histogram This algorithm extends the patience algorithm to "support low-occurrence common elements". For instance, if you configured diff.algorithm variable to a non-default value and want to use the default one, then you have to use --diff-algorithm=default option. Soon we'll have another diff algorithm "anchor" that tries to keep a given line out of the +/- but rather move other lines around the line to give equal results. ``` ## Junio C Hamano, 2017-12-07 20:28 Subject: Re: Feature request: Reduce amount of diff in patch Message-ID: URL: https://gitlist.dev/e/xmqqtvx2cmf9.fsf%40gitster.mtv.corp.google.com In-Reply-To: ``` Stefan Beller writes: > On Tue, Nov 28, 2017 at 8:09 AM, KES wrote: > ... >> May you please fix the git to generate minimized patches? > > You can use a different diff algorithm. > ... > Soon we'll have another diff algorithm "anchor" that tries to > keep a given line out of the +/- but rather move other lines around > the line to give equal results. While all of the above is correct, my understanding is that none of them would produce a patch that KES wants to see. And we shouldn't ;-) The two changes KES shows in the message are not equivalent. ```