All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Alexander Rinass <alex@fournova.com>
Cc: "Torsten Bögershausen" <tboegi@web.de>, git@vger.kernel.org
Subject: Re: git diff does not precompose unicode file paths (OS X)
Date: Fri, 04 Mar 2016 10:36:44 -0800	[thread overview]
Message-ID: <xmqqsi06yts3.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <D9E0FEEC-1987-4045-AD0F-4C7C76DC067B@fournova.com> (Alexander Rinass's message of "Fri, 4 Mar 2016 15:37:05 +0100")

Alexander Rinass <alex@fournova.com> writes:

> Sticking a precompose_argv(argc, argv) into diff.c’s cmd_diff
> function fixes the issue.
>
> But I had to disable the check (precomposed_unicode != 1) in
> precompose_argv to make it work. That’s probably because
> precompose_argv is usually called from parse_options and is
> missing some other call before it?

The "precomposed_unicode" bit comes from your configuration file,
so it won't be usable before you call into git_default_core_config
and that happens via a call to "git_config(git_diff_ui_config, NULL)".

So perhaps you'd want to add the argv munging immediately before
init_revisions() call there?

  reply	other threads:[~2016-03-04 18:36 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-04  9:07 git diff does not precompose unicode file paths (OS X) Alexander Rinass
2016-03-04 12:16 ` Torsten Bögershausen
2016-03-04 14:37   ` Alexander Rinass
2016-03-04 18:36     ` Junio C Hamano [this message]
2016-03-04 18:49     ` Ramsay Jones
2016-03-07  7:47       ` Alexander Rinass
2016-03-07  8:54         ` Torsten Bögershausen
     [not found]           ` <5C6A30EF-ED0A-4D64-B971-CF873C64B46E@fournova.com>
2016-03-08 12:30             ` Torsten Bögershausen
2016-03-14 21:45               ` Alexander Rinass
2016-03-15  5:45                 ` Torsten Bögershausen
2016-04-04 20:43                   ` Alexander Rinass

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=xmqqsi06yts3.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=alex@fournova.com \
    --cc=git@vger.kernel.org \
    --cc=tboegi@web.de \
    /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.