From: Ivan Kanis <expire-by-2011-02-07@kanis•fr>
To: Konstantin Khomoutov <flatworm@users•sourceforge.net>
Cc: git@vger•kernel.org
Subject: Re: problem when pulling a specific branch from origin
Date: Wed, 02 Feb 2011 10:54:34 +0100 [thread overview]
Message-ID: <87d3naiwx1.fsf@kanis.fr> (raw)
In-Reply-To: <20110202001734.GL5713@localhost.localdomain> (Konstantin Khomoutov's message of "Wed, 2 Feb 2011 03:17:34 +0300")
[-- Attachment #1: Type: text/plain, Size: 3355 bytes --]
Hi Konstantin,
Thanks for your thorough answer.
Konstantin Khomoutov <flatworm@users•sourceforge.net> wrote:
> The first one is that you seem to maintain a wrong idea about what
> happens when you do `git pull origin branch`. It appears you assume
> this action is supposed to first update the local branch
> "remotes/origin/branch" and then merge it to the locally checked out
> branch. The truth is that specifying a branch in this way to git-pull
> (or git-fetch, which is called by git-pull) is a special case -- it
> means that no corresponding local ref is updated, and the fetched line
> of history is directly merged into the checked out branch right after
> fetching (see the git-fetch manual and the EXAMPLES section in the
> git-pull manual).
You're right I get the wrong idea of pull origin branch, it's a special
case and it doesn't update local ref.
> I'm not really sure about your expectation as you did not clearly
> articulate them, so it seems there are two points to touch here...
I expect my local ref to be updated with the server ref.
> In your particular case you're merging remote branch "branch" which is
> one commit ahead of remote "master" to the locally checked branch
> "master" which is, at the moment, the same as the same-named remote
> branch. Consequently, after merging "branch" (which results in
> fast-forward) your local branch "master" starts to be one commit ahead
> of its remote counterpart; no local branches beyond this one are
> updated.
I forgot to checkout the branch in the repository bar, I have attached
the updated script. The result is the same my branch is one commit ahead.
If we run git fetch without argument the refs are updated:
yan:~/tmp/bar$ git fetch
From /home/ivan/tmp/foo
6fe0a63..ebcae31 branch -> origin/branch
However running fetch without arguments pull all remote refs which my
developer does not want. Is there a command to update a specific
remote ref?
> The second point is less clear/more complicated.
> At first, it's not clear whether you wanted to have the remote branch
> "branch" become the active local branch during the cloning process, or
> "master" (in your case "master" became the active branch).
> On the one hand, you explicitly branched "branch" off "master" right
> before cloning (updating the first repo's HEAD ref) which hints you
> intended that branch to be default in the clone.
> On the other hand, while the documentation says the default branch in
> the clone is the one listed in the HEAD ref of the source repository, in
> my tests using Git (1.7.2.x in Debian and msysgit 1.7.3.x), in cases
> like yours the destination repository ends up having the "master" branch
> as the default one, not the branch from the HEAD ref; to make this work,
> the branch listed in the HEAD ref should have received at least one
> commit after forking. I suspect the problem might be in that such a
> branch freshly cloned off "master" points to the same commit object's
> name which might confuse Git.
> This, in my eyes, might indeed display a bug.
The current behavior is a bit weird to say the least, I don't know if
it's a bug.
Take care,
--
Ivan Kanis
http://kanis.fr
At Group L, Stoffel oversees six first-rate programmers, a
managerial challenge roughly comparable to herding cats.
-- Anonymous , 1985-06-09 , The Washington Post
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: repro.sh --]
[-- Type: text/x-sh, Size: 296 bytes --]
#!/bin/sh
rm -rf foo bar
git --version
mkdir foo
cd foo
git init
echo foo > foo.txt
git add foo.txt
git commit -am"foo"
git checkout -b branch
cd ..
git clone foo bar
cd foo
echo bar > foo.txt
git commit -am"bar"
cd ..
cd bar
git checkout branch
git pull origin branch
git status
git branch -rv
prev parent reply other threads:[~2011-02-02 9:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-01 17:25 problem when pulling a specific branch from origin Ivan Kanis
2011-02-02 0:17 ` Konstantin Khomoutov
2011-02-02 9:54 ` Ivan Kanis [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=87d3naiwx1.fsf@kanis.fr \
--to=expire-by-2011-02-07@kanis$(echo .)fr \
--cc=flatworm@users$(echo .)sourceforge.net \
--cc=git@vger$(echo .)kernel.org \
/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