git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Phil Hord <phil.hord@gmail.com>,
	Timothy Madden <terminatorul@gmail.com>,
	Git <git@vger.kernel.org>
Subject: Re: Wrong tabs in terminal output for git diff
Date: Mon, 14 Jun 2021 10:26:10 +0900	[thread overview]
Message-ID: <xmqqa6nt1bkd.fsf@gitster.g> (raw)
In-Reply-To: <YMWD6G14YxfM1uE6@coredump.intra.peff.net> (Jeff King's message of "Sun, 13 Jun 2021 00:04:56 -0400")

Jeff King <peff@peff.net> writes:

> We do have a few "display only" modes. You mentioned --color-words, but
> --textconv is similar (and of course --ext-diff can generate whatever it
> wants). I'm not sure how helpful that is, though, because humans end up
> needing to look at "real" diffs that can be applied often enough (and as
> you note, changing those would break them).

Add "--irreversible-delete" to the set.  We should perhaps find a
migration path to eventually disable these "display only" things in
format-patch [*1*], if we do not already do so.

> This could be addressed at the viewing layer, though, which is what's
> converting the tabstops to screen positions. For example, "less -x9,17"
> adjusts the tab stops in the pager to account for the extra leading
> character (and you can put it into $LESS or $GIT_PAGER to have it kick
> in automatically).

That's a cute one (and can be used not just on "git diff" output but
on output from "diff" by other people).

Thanks.


[References]

*1* https://lore.kernel.org/git/7vsj8dcdv6.fsf@alter.siamese.dyndns.org/


      reply	other threads:[~2021-06-14  1:26 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-11 19:25 Wrong tabs in terminal output for git diff Timothy Madden
2021-06-11 21:08 ` Felipe Contreras
2021-06-12 23:10 ` Phil Hord
2021-06-13  4:04   ` Jeff King
2021-06-14  1:26     ` Junio C Hamano [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=xmqqa6nt1bkd.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=phil.hord@gmail.com \
    --cc=terminatorul@gmail.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).