From: Phil Hord <phil.hord@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git <git@vger.kernel.org>,
"Martin Ågren" <martin.agren@gmail.com>,
"Elijah Newren" <newren@gmail.com>
Subject: Re: [PATCH v3] use delete_refs when deleting tags or branches
Date: Fri, 22 Jan 2021 12:29:27 -0800 [thread overview]
Message-ID: <CABURp0rvK=53L6UsSirZ0bs-FhK+s_3s7VNvwhR4ky-Pf7HEog@mail.gmail.com> (raw)
In-Reply-To: <xmqqlfclaf6b.fsf@gitster.c.googlers.com>
On Thu, Jan 21, 2021 at 6:17 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Phil Hord <phil.hord@gmail.com> writes:
>
> > Oof. Sorry. I forgot I have diff.noprefix=true in my local config.
> > It is a huge timesaver for me when looking at diffs on a console since
> > I can quickly highlight the filename with a mouse to paste into an
> > editor.
> >
> > Sometimes it bites me, though. Usually I notice in the diff, but this
> > one I was sending with format-patch / send-email.
> >
> > I guess I'll turn that off in git.git so I don't misfire at you again someday.
>
> I think per-repository configuration might be sufficient for this
> particular case (after all, it is project's preference), I wonder if
> a more command-specific variant of diff.noprefix so that "log -p"
> and "format-patch" can be configured separately would make sense,
> something like...
>
> [diff]
> noprefix = true
> [diff "format-patch"]
> noprefix = false
> [diff "show"]
> noprefix = false
That seems reasonable. I was trying to think of something clever like
a setting like "auto" that means "noprefix when output is to a tty".
But I still sometimes send a patch to a coworker that I copied from my
console and I then have to remember to add back in the prefixes. So
there is no perfect solution from Git, I think. The correct solution
is to teach my console to skip the prefixes when I double-click the
filename; or to add symlinks at `a` and `b` in my project; or
something else. But these are all more painful than noprefix = true,
so far.
Fwiw - I know this issue has been discussed on the list before; there
are others who feel this itch.
Having config diff.<command>.noprefix seems reasonable as a fix for
format-patch. At first glance it seems like this could get confused
with diff.<driver>.*, but I suppose those settings are all specific to
a driver section, so it would be easy enough to keep them separate.
next prev parent reply other threads:[~2021-01-22 20:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 3:23 [PATCH v3] use delete_refs when deleting tags or branches Phil Hord
2021-01-22 0:04 ` Junio C Hamano
2021-01-22 0:27 ` Phil Hord
2021-01-22 2:17 ` Junio C Hamano
2021-01-22 20:29 ` Phil Hord [this message]
2021-01-22 2:42 ` 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='CABURp0rvK=53L6UsSirZ0bs-FhK+s_3s7VNvwhR4ky-Pf7HEog@mail.gmail.com' \
--to=phil.hord@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=newren@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.
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).