git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Bruno Haible <bruno@clisp.org>
Cc: git@vger.kernel.org
Subject: Re: GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts
Date: Sun, 30 Sep 2007 12:59:26 -0700	[thread overview]
Message-ID: <7vk5q7hqld.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <200709302117.37422.bruno@clisp.org> (Bruno Haible's message of "Sun, 30 Sep 2007 21:17:37 +0200")

> "git diff --uncached" invokes the GIT_EXTERNAL_DIFF variable with just one
> argument (instead of 7 arguments, as documented) in a particular situation:

You are looking at an unmerged path.

    'GIT_EXTERNAL_DIFF'::
            When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
            program named by it is called, instead of the diff invocation
            described above.  For a path that is added, removed, or modified,
            'GIT_EXTERNAL_DIFF' is called with 7 parameters:

    ...
    +
    For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
    parameter, <path>.

The script needs to decide how it wants to present an unmerged
path; the information on each unmerged stages can be read from
the output of "ls-files -u $thatpath".

  reply	other threads:[~2007-09-30 19:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-30 19:17 GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts Bruno Haible
2007-09-30 19:59 ` Junio C Hamano [this message]
2007-09-30 21:25   ` Bruno Haible

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=7vk5q7hqld.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=bruno@clisp.org \
    --cc=git@vger.kernel.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 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 NNTP newsgroup(s).