From: Michael J Gruber <git@drmicha.warpmail.net>
To: Peter Oberndorfer <kumbayo84@arcor.de>
Cc: Git List <git@vger.kernel.org>
Subject: Re: textconv not invoked when viewing merge commit
Date: Tue, 12 Apr 2011 11:04:43 +0200 [thread overview]
Message-ID: <4DA415AB.9020008@drmicha.warpmail.net> (raw)
In-Reply-To: <201104111912.47547.kumbayo84@arcor.de>
Peter Oberndorfer venit, vidit, dixit 11.04.2011 19:12:
> Hi,
>
> i currently use a textconv filter to show contents of a zip like archive in a user readable format(as a list of contained files).
>
> This works fine, except for merge commits.
> For merge commits i see the diff of the binary contents of the file.
>
> Is this intentional?
> git help gitattributes mentions no such limitation.
> Anywhere else(gitk(on non merge commit), git gui blame) i see the the filtered textual representation of the file.
>
> I tried 1.7.4 msysgit and current master
>
> Greetings Peter
textconv is applied for "diff -m" but not for combined diffs (-c, --cc)
at the moment. They go through a completely different codepath, so it is
expected code-wise (not a bug per se) but not ui-wise.
Looking at the code and trying to dig something up atm...
Michael
next prev parent reply other threads:[~2011-04-12 9:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-11 17:12 textconv not invoked when viewing merge commit Peter Oberndorfer
2011-04-12 9:04 ` Michael J Gruber [this message]
2011-04-14 19:09 ` Jeff King
2011-04-14 19:15 ` Jeff King
2011-04-14 19:26 ` Junio C Hamano
2011-04-14 19:28 ` Jeff King
2011-04-14 19:35 ` Michael J Gruber
2011-04-14 19:43 ` Junio C Hamano
2011-04-14 20:06 ` Junio C Hamano
2011-04-14 20:23 ` Jeff King
2011-04-14 21:05 ` Junio C Hamano
2011-04-14 21:30 ` Jeff King
2011-04-15 15:29 ` [PATCH] combine-diff: use textconv for combined diff format Michael J Gruber
2011-04-15 18:34 ` Junio C Hamano
2011-04-16 10:24 ` Michael J Gruber
2011-04-16 17:19 ` Junio C Hamano
2011-04-16 21:37 ` Jakub Narebski
2011-04-15 23:56 ` Jeff King
2011-04-21 16:08 ` Peter Oberndorfer
2011-04-15 6:54 ` textconv not invoked when viewing merge commit Matthieu Moy
2011-04-15 20:45 ` Junio C Hamano
2011-04-16 1:47 ` Jeff King
2011-04-16 6:10 ` Junio C Hamano
2011-04-16 6:33 ` Jeff King
2011-04-16 16:23 ` 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=4DA415AB.9020008@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=kumbayo84@arcor.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.