From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".)
Date: Sat, 03 Feb 2007 01:17:51 +0100 [thread overview]
Message-ID: <eq0k8q$rih$1@sea.gmane.org> (raw)
In-Reply-To: 20070202235655.GG5362@nan92-1-81-57-214-146.fbx.proxad.net
Yann Dirson wrote:
> With current GIT HEAD, plain git-clone creates the following config
> (when cloning a repo with HEAD pointing to branch "downstream":
>
>
> [remote "origin"]
> url = /export/work/yann/git/stgit/tmp/.git
> fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "downstream"]
> remote = origin
> merge = refs/heads/downstream
> ^^^^^^^^^^^^^^^^^^^^^
>
> I would have expected "merge = remotes/origin/downstream" instead, and
> this setting confuses the rebase-after-pull logic, causing it to
> rebase the stack onto its own base (no-op).
>
> Isn't that a git-clone bug ?
No, it is a feature. branch.<name>.merge is usually _remote_ head,
to allow pulling without local tracking branch. IIRC there was
patch to allow to use local head, if it is ambiguous.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2007-02-03 0:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-01 23:47 [PATCH 0/3] Update to stgit parent tracking Yann Dirson
2007-02-01 23:48 ` [PATCH 1/3] The user does not want to mess with the refspecs Yann Dirson
2007-02-01 23:48 ` [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull" Yann Dirson
2007-02-02 9:58 ` Catalin Marinas
2007-02-02 18:07 ` Yann Dirson
2007-02-02 22:42 ` Yann Dirson
2007-02-02 23:01 ` Catalin Marinas
2007-02-02 23:25 ` Catalin Marinas
2007-02-03 21:46 ` Yann Dirson
2007-02-03 23:01 ` Junio C Hamano
2007-02-04 0:23 ` Junio C Hamano
2007-02-04 0:24 ` Yann Dirson
2007-02-04 1:49 ` Jeff King
2007-02-04 2:10 ` Junio C Hamano
2007-02-04 2:38 ` Jeff King
2007-02-02 23:56 ` git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".) Yann Dirson
2007-02-03 0:14 ` Yann Dirson
2007-02-03 0:17 ` Jakub Narebski [this message]
2007-02-03 12:16 ` Catalin Marinas
2007-02-03 14:47 ` Yann Dirson
2007-02-01 23:48 ` [PATCH 3/3] Do not return 'origin' as parent remote when there is no such remote Yann Dirson
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='eq0k8q$rih$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.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.
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).