From: Junio C Hamano <gitster@pobox•com>
To: Krzesimir Nowak <krzesimir@endocode•com>
Cc: git@vger•kernel.org
Subject: Re: [RFC] make --set-upstream work for local branches not in refs/heads
Date: Tue, 04 Mar 2014 11:44:47 -0800 [thread overview]
Message-ID: <xmqqlhwpkats.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1393942046-11488-1-git-send-email-krzesimir@endocode.com> (Krzesimir Nowak's message of "Tue, 4 Mar 2014 15:07:25 +0100")
Krzesimir Nowak <krzesimir@endocode•com> writes:
> It might be possible (in "Gerrited" setups) to have local branches
> outside refs/heads/, like for example in following fetch config:
>
> [remote "origin"]
> url = ssh://user@example.com/my-project
> fetch = +refs/heads/*:refs/remotes/origin/*
> fetch = +refs/wip/*:refs/remotes/origin-wip/*
>
> Let's say that 'test' branch already exist in origin/refs/wip/. If I
> call:
>
> git checkout test
>
> then it will create a new branch and add an entry to .git/config:
>
> [branch "test"]
> remote = origin
> merge = refs/wip/test
>
> But if I create a branch 'test2' and call:
>
> git push --set-upstream origin test2:refs/wip/test2
>
> then branch is pushed, but no entry in .git config is created.
By definition anything otuside refs/heads/ is not a branch, so do
not call things in refs/wip "branches". Retitle it to "work for
local refs outside refs/heads" or something.
Having said that, I do not see a major problem if we allowed
[branch "test2"]
remote = origin
merge = refs/wip/test2
to be created when "push --setupstream" is requested, making
test2@{upstream} to point at refs/remotes/origin-wip/test2.
I do not know what the correct implementation of such a feature
should be, though.
next prev parent reply other threads:[~2014-03-04 19:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 14:07 [RFC] make --set-upstream work for local branches not in refs/heads Krzesimir Nowak
2014-03-04 14:07 ` [PATCH] RFC: make --set-upstream work for branches not in refs/heads/ Krzesimir Nowak
2014-03-04 19:44 ` Junio C Hamano [this message]
2014-03-06 9:27 ` [RFC] make --set-upstream work for local branches not in refs/heads Krzesimir Nowak
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=xmqqlhwpkats.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=krzesimir@endocode$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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