From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>,
Git Mailing List <git@vger.kernel.org>,
Vincent Guittot <vincent.guittot@linaro.org>
Subject: Re: [Query] Separate hooks for Git worktrees
Date: Fri, 10 Nov 2017 10:00:51 -0800 [thread overview]
Message-ID: <CAGZ79kZ8PKBwe+aWTUOgPwV2tNQS7+dUrLTVsWhzemj-e35kaA@mail.gmail.com> (raw)
In-Reply-To: <xmqq60aihgod.fsf@gitster.mtv.corp.google.com>
On Thu, Nov 9, 2017 at 9:00 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> We have no worktree specific config yet, though patches for
>> this were floated on the mailing list.
>>
>> Though recent versions of git learned to conditionally include
>> config files. (look for includeIf in man git-config), which I think
>> could be used to set the option gerrit.createChangeId depending
>> on the worktree you are in.
>>
>>> Any idea how I can get around this problem without having separate
>>> repositories for kernel and android ?
>>
>> The proposed approach above might be hacky but sounds as if
>> it should work?
>
> If you meant "conditional include" by "proposed approach above", I
> do not see which part you found possibly hacky.
Compared to a per-worktree configuration that you can setup via
git config --for-worktree=X key value
the setup using conditional includes seems hacky to me.
(I just realize that these conditional includes can be set using
regular git-config, so maybe it is not as hacky as I thought.)
> It is to allow
> different set of configurations to apply depending on where you are
> working at, which I think was invented exactly for something like
> this.
From a UX perspective, I can imagine a way easier workflow,
but the data model seems to make sense.
> It certainly is not any hackier than using the same repository to
> house separately manged projects even if they may be related
> projects.
Well it is the same project with different upstream workflows.
For example I would imagine that Viresh wants to cherry-pick
from one branch to another, or even send the same patch
(just with different commit messages, with or without the
ChangeId) to the different upstreams?
> Where does the aversion of "having separate repositories" primarily
> come from? Is it bad due to disk consumption? Is it bad because
> you cannot do "git diff android-branch kernel-branch"? Something
> else?
Yeah, that is an interesting question!
(I suspect workflow related things, diff/cherry-pick)
> If it is purely disk consumption that is an issue, perhaps the real
> solution is to make it easier to maintain separate repositories
> while sharing as much disk space as possible. GC may have to be
> made a lot more robust in the presense of alternate object stores,
> for example.
next prev parent reply other threads:[~2017-11-10 18:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-09 10:58 [Query] Separate hooks for Git worktrees Viresh Kumar
2017-11-09 19:14 ` Stefan Beller
2017-11-10 3:38 ` Viresh Kumar
2017-11-10 5:00 ` Junio C Hamano
2017-11-10 18:00 ` Stefan Beller [this message]
2017-11-13 3:16 ` Viresh Kumar
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=CAGZ79kZ8PKBwe+aWTUOgPwV2tNQS7+dUrLTVsWhzemj-e35kaA@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vincent.guittot@linaro.org \
--cc=viresh.kumar@linaro.org \
/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).