From: Junio C Hamano <gitster@pobox•com>
To: David Aguilar <davvid@gmail•com>
Cc: git@vger•kernel.org, Charles Bailey <charles@hashpling•org>,
Charles Bailey <cbailey32@bloomberg•net>
Subject: Re: [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help
Date: Mon, 13 Oct 2014 12:16:55 -0700 [thread overview]
Message-ID: <xmqqsiir3hlk.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1413016778-94829-2-git-send-email-davvid@gmail.com> (David Aguilar's message of "Sat, 11 Oct 2014 01:39:37 -0700")
David Aguilar <davvid@gmail•com> writes:
> From: Charles Bailey <cbailey32@bloomberg•net>
>
> Signed-off-by: Charles Bailey <cbailey32@bloomberg•net>
> Signed-off-by: David Aguilar <davvid@gmail•com>
> ---
> Changes since v2:
>
> This now uses the new git_dir_init function.
>
> git-mergetool.sh | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index 96a61ba..cddb533 100755
> --- a/git-mergetool.sh
> +++ b/git-mergetool.sh
> @@ -10,11 +10,11 @@
>
> USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
> SUBDIRECTORY_OK=Yes
> +NONGIT_OK=Yes
> OPTIONS_SPEC=
> TOOL_MODE=merge
> . git-sh-setup
> . git-mergetool--lib
> -require_work_tree
>
> # Returns true if the mode reflects a symlink
> is_symlink () {
> @@ -378,6 +378,9 @@ prompt_after_failed_merge () {
> done
> }
>
> +require_work_tree
> +git_dir_init
This is somewhat curious. Shouldn't the order of these swapped?
> +
> if test -z "$merge_tool"
> then
> # Check if a merge tool has been configured
next prev parent reply other threads:[~2014-10-13 19:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-11 8:39 [PATCH v3 1/3] git-sh-setup: move GIT_DIR initialization into a function David Aguilar
2014-10-11 8:39 ` [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help David Aguilar
2014-10-11 8:39 ` [PATCH v3 3/3] difftool: don't assume that default sh is sane David Aguilar
2014-10-13 19:16 ` Junio C Hamano [this message]
2014-10-15 6:35 ` [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help David Aguilar
2014-10-15 6:48 ` David Aguilar
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsiir3hlk.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=cbailey32@bloomberg$(echo .)net \
--cc=charles@hashpling$(echo .)org \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox