From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
To: KES <kes-kes@yandex.ru>
Cc: git@vger.kernel.org
Subject: Re: Feature request: Reduce amount of diff in patch
Date: Tue, 28 Nov 2017 22:54:45 +0530 [thread overview]
Message-ID: <1511889885.16420.3.camel@gmail.com> (raw)
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
next prev parent reply other threads:[~2017-11-28 17:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-28 16:09 Feature request: Reduce amount of diff in patch KES
2017-11-28 17:24 ` Kaartic Sivaraam [this message]
2017-12-07 20:13 ` Stefan Beller
2017-12-07 20:28 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1511889885.16420.3.camel@gmail.com \
--to=kaartic.sivaraam@gmail.com \
--cc=git@vger.kernel.org \
--cc=kes-kes@yandex.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).