From: Denton Liu <liu.denton@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, anmolmago@gmail.com, briankyho@gmail.com,
david.lu97@outlook.com, shirui.wang@hotmail.com,
davvid@gmail.com
Subject: Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments
Date: Wed, 24 Oct 2018 01:30:21 -0400 [thread overview]
Message-ID: <20181024053021.GA14408@archbookpro.localdomain> (raw)
In-Reply-To: <xmqqy3aond55.fsf@gitster-ct.c.googlers.com>
On Wed, Oct 24, 2018 at 02:10:14PM +0900, Junio C Hamano wrote:
> In mode_ok shell function, we seem to be prepared to deal with a
> case where neither diff_mode nor merge_mode is true. Should this
> codepath also be prepared to?
>
According to Documentation/git-mergetool--lib.txt,
>Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE`
>to define the operation mode for the functions listed below.
>'diff' and 'merge' are valid values.
so I think that we can assume that the one of diff_mode or merge_mode
will return true. In any case, it seems like the rest of the code was
written under this assumption so if this needs to be changed then the
whole library needs to be fixed as well.
next prev parent reply other threads:[~2018-10-24 5:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 2:25 [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments Denton Liu
2018-10-24 5:10 ` Junio C Hamano
2018-10-24 5:30 ` Denton Liu [this message]
2018-10-24 5:44 ` David Aguilar
2018-10-24 5:58 ` [PATCH v2 1/2] mergetool: accept " Denton Liu
2018-10-24 16:25 ` [PATCH v3 0/3] Add --gui to mergetool Denton Liu
2018-10-24 16:25 ` [PATCH v3 1/3] mergetool: accept -g/--[no-]gui as arguments Denton Liu
2018-10-24 16:25 ` [PATCH v3 2/3] completion: support `git mergetool --[no-]gui` Denton Liu
2018-10-24 16:25 ` [PATCH v3 3/3] doc: document diff/merge.guitool config keys Denton Liu
2018-10-26 6:11 ` [RESEND PATCH v3 0/3] Add --gui to mergetool Denton Liu
2018-10-26 13:15 ` Junio C Hamano
2018-10-26 6:11 ` [RESEND PATCH v3 1/3] mergetool: accept -g/--[no-]gui as arguments Denton Liu
2018-10-26 6:11 ` [RESEND PATCH v3 2/3] completion: support `git mergetool --[no-]gui` Denton Liu
2018-10-26 6:11 ` [RESEND PATCH v3 3/3] doc: document diff/merge.guitool config keys Denton Liu
2018-10-24 5:58 ` [PATCH v2 2/2] completion: support `git mergetool --[no-]gui` Denton Liu
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=20181024053021.GA14408@archbookpro.localdomain \
--to=liu.denton@gmail.com \
--cc=anmolmago@gmail.com \
--cc=briankyho@gmail.com \
--cc=david.lu97@outlook.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=shirui.wang@hotmail.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).