From: David Aguilar <davvid@gmail.com>
To: lin.sun@zoom.us
Cc: "'Đoàn Trần Công Danh'" <congdanhqx@gmail.com>,
"'Pratyush Yadav'" <me@yadavpratyush.com>,
"'sunlin via GitGitGadget'" <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior
Date: Mon, 29 Jun 2020 23:48:00 -0700 [thread overview]
Message-ID: <20200630064800.GB1962986@gmail.com> (raw)
In-Reply-To: <bfc401d64df4$cd189e70$6749db50$@zoom.us>
On Mon, Jun 29, 2020 at 05:08:02PM +0800, lin.sun@zoom.us wrote:
> Hi Danh,
>
> > It seems like only David Aguilar (Cc-ed) works on that file.
> >Look into b12d04503b (mergetools/meld: make usage of `--output` configurable and more robust, 2014-10-15), it looks like we need to check if --auto-merge option is available in meld.
> >Someone still live with the ancient tools ;).
> >meld has known --output for a long time but we still have a check for it.
>
> Thank you for your hints, I changed the patch for checking the option "--auto-merge" in meld and use this option only if it's available.
> The last patch is appended in attachment, or https://github.com/git/git/commit/3b70fd0bfc4086a08e27c869ff7492d567e8fdc2
>
> Look forward it can be merged this time.
> Thanks
>
> Regards
> Lin
Hello, thank you for making this change and keeping the checks around
for the older versions.
One comment on the patch -- it looks like it duplicates the version
check logic. Would it be possible to coalesce the version check so that
we only exec meld once for the two version checks?
The changes look good nonetheless, and perhaps combining the checks
would make it too complex, so this looks good to me.
Can you please submit the patch to the list here?
Once you do, please feel free to add my sign-off:
Signed-off-by: David Aguilar <davvid@gmail.com>
cheers,
--
David
next prev parent reply other threads:[~2020-06-30 6:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 3:33 [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior lin.sun
2020-06-28 6:23 ` lin.sun
2020-06-28 10:37 ` Đoàn Trần Công Danh
2020-06-29 9:08 ` lin.sun
2020-06-30 6:48 ` David Aguilar [this message]
2020-06-30 15:55 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2020-05-08 1:25 [PATCH] " sunlin via GitGitGadget
2020-06-09 3:19 ` [PATCH v2] " sunlin via GitGitGadget
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=20200630064800.GB1962986@gmail.com \
--to=davvid@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=lin.sun@zoom.us \
--cc=me@yadavpratyush.com \
/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).