public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Mike Hommey <mh@glandium•org>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v2] Allow to control where the replace refs are looked for
Date: Fri, 12 Jun 2015 15:36:05 -0700	[thread overview]
Message-ID: <xmqqioasblm2.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqmw04blwm.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Fri, 12 Jun 2015 15:29:45 -0700")

Junio C Hamano <gitster@pobox•com> writes:

> Mike Hommey <mh@glandium•org> writes:
>
>> It can be useful to have grafts or replace refs for specific use-cases while
>> keeping the default "view" of the repository pristine (or with a different
>> set of grafts/replace refs).
>>
>> It is possible to use a different graft file with GIT_GRAFT_FILE, but while
>> replace refs are more powerful, they don't have an equivalent override.
>>
>> Add a GIT_REPLACE_REF_BASE environment variable to control where git is
>> going to look for replace refs.
>>
>> Signed-off-by: Mike Hommey <mh@glandium•org>
>> ---
>>  builtin/replace.c | 6 +++---
>>  cache.h           | 2 ++
>>  environment.c     | 6 ++++++
>>  log-tree.c        | 5 +++--
>>  refs.c            | 3 ++-
>>  5 files changed, 16 insertions(+), 6 deletions(-)
>
> Thanks.
>
> "git am" seems to be seeing a patch based on a stale base.  What
> branch did you base this on?

Ah, no need to resend; the conflict is with recently merged
bc/object-id.

Thanks.

     prev parent reply	other threads:[~2015-06-12 22:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-11  1:47 [PATCH] Allow to control the namespace for replace refs Mike Hommey
2015-06-11  4:55 ` Junio C Hamano
2015-06-11  5:13   ` Mike Hommey
2015-06-11 15:16     ` Junio C Hamano
2015-06-11 20:46       ` Mike Hommey
2015-06-11 20:55         ` Junio C Hamano
2015-06-11 21:34       ` [PATCH v2] Allow to control where the replace refs are looked for Mike Hommey
2015-06-12 22:29         ` Junio C Hamano
2015-06-12 22:36           ` 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

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

  git send-email \
    --in-reply-to=xmqqioasblm2.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=mh@glandium$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox