git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Derrick Stolee <stolee@gmail.com>
Cc: git@vger.kernel.org, Derrick Stolee <dstolee@microsoft.com>,
	Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH] add core.usereplacerefs config option
Date: Wed, 18 Jul 2018 16:44:24 -0400	[thread overview]
Message-ID: <20180718204424.GA1483@sigill.intra.peff.net> (raw)
In-Reply-To: <20180718203152.GA26110@sigill.intra.peff.net>

On Wed, Jul 18, 2018 at 04:31:52PM -0400, Jeff King wrote:

> Since Stefan's patch logically undoes e1111cef23, I think that's why he
> put in the comment to move back to the old name.
> 
> Personally, I do not find one name any more informative than the other,
> and would be happy to leave it as-is (dropping the comment).
> 
> But I'm also fine with following through on the "do". According to
> c3c36d7de2, that was waiting for a calmer time in the code base. I guess
> the best way to find out is to write the patch and see how terribly it
> conflicts with pu. :)

It turns out there are no conflicts right now, aside from the patch I
just sent. And perhaps your commit-graph work is going to add another
reference, if you take my suggestion in the other thread. ;)

So I remain ambivalent, but here is the patch to do so, with mine now on
top (the only difference is s/read/check/ in the variable name).

But note that while changing this, I noticed a leftover bit from
c3c36d7de2 that should be dealt with in either case. I put that at the
front of the series.

  [1/3]: check_replace_refs: fix outdated comment
  [2/3]: check_replace_refs: rename to read_replace_refs
  [3/3]: add core.usereplacerefs config option

 Documentation/config.txt | 5 +++++
 builtin/fsck.c           | 2 +-
 builtin/index-pack.c     | 2 +-
 builtin/pack-objects.c   | 2 +-
 builtin/prune.c          | 2 +-
 builtin/replace.c        | 2 +-
 builtin/unpack-objects.c | 2 +-
 builtin/upload-pack.c    | 2 +-
 cache.h                  | 6 ++----
 config.c                 | 5 +++++
 environment.c            | 4 ++--
 git.c                    | 2 +-
 log-tree.c               | 2 +-
 replace-object.c         | 2 +-
 replace-object.h         | 2 +-
 t/t6050-replace.sh       | 6 ++++++
 16 files changed, 31 insertions(+), 17 deletions(-)

-Peff

  parent reply	other threads:[~2018-07-18 20:44 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-18 20:17 [PATCH] add core.usereplacerefs config option Jeff King
2018-07-18 20:23 ` Derrick Stolee
2018-07-18 20:31   ` Jeff King
2018-07-18 20:37     ` Stefan Beller
2018-07-18 20:44     ` Jeff King [this message]
2018-07-18 20:44       ` [PATCH 1/3] check_replace_refs: fix outdated comment Jeff King
2018-07-18 22:41         ` Junio C Hamano
2018-07-18 22:52           ` Jeff King
2018-07-18 20:45       ` [PATCH 2/3] check_replace_refs: rename to read_replace_refs Jeff King
2018-07-18 22:44         ` Junio C Hamano
2018-07-18 22:53           ` Jeff King
2018-07-18 20:45       ` [PATCH 3/3] add core.usereplacerefs config option Jeff King

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=20180718204424.GA1483@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=dstolee@microsoft.com \
    --cc=git@vger.kernel.org \
    --cc=sbeller@google.com \
    --cc=stolee@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).