All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Michael Forney <mforney@mforney.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Drop some dashes from built-in invocations in scripts
Date: Sun, 06 Aug 2017 18:31:08 -0700	[thread overview]
Message-ID: <xmqq8tiwrwo3.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAGw6cBsYiGH1h8C8qFp-yX3arzkaRi_vghpjbErxjoYHXxpu+Q@mail.gmail.com> (Michael Forney's message of "Sat, 5 Aug 2017 22:35:47 -0700")

Michael Forney <mforney@mforney.org> writes:

> Ah. Well, it looks like all but git-merge-resolve.sh run `.
> git-sh-setup`, so we know that GIT_EXEC_PATH must in their PATH (and
> at the front unless the script was invoked directly).
>
> git-merge-resolve.sh does not do this, so I suppose if the user ran
> $GIT_EXEC_PATH/git-merge-resolve directly, and also had a custom
> git-merge-index executable in their PATH, that would switch to running
> the git merge-index built-in instead.

We are good then.  Nobody other than "git merge" should be running
merge-resolve, so the original probably is OK.

Thanks for digging deeper.

  reply	other threads:[~2017-08-07  1:31 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-05  6:49 [PATCH] Drop some dashes from built-in invocations in scripts Michael Forney
2017-08-05 22:15 ` Johannes Schindelin
2017-08-05 22:41 ` Junio C Hamano
2017-08-05 22:54   ` Michael Forney
2017-08-05 23:31     ` Junio C Hamano
2017-08-06  5:35       ` Michael Forney
2017-08-07  1:31         ` Junio C Hamano [this message]
2017-08-05 23:30   ` Johannes Schindelin
2017-08-07 16:35 ` Junio C Hamano
2017-08-07 17:12   ` Junio C Hamano
2017-08-07 17:58     ` Michael Forney
2017-08-07 18:18       ` Junio C Hamano
2017-08-07 19:22   ` Johannes Schindelin
2017-08-07 19:48     ` Junio C Hamano
2017-08-07 21:07   ` Johannes Schindelin
2017-08-07 21:47     ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq8tiwrwo3.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=mforney@mforney.org \
    /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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.