stg pull doesn't pull anymore

stg pull doesn't pull anymore

[Pavel Roskin]

Hello!

I have noticed that "stg pull" doesn't merge the latest changes anymore.
It fetches the new branches, but the HEAD remains unchanged.

I'm using the current version of git and StGIT (mast branches of both).
I don't have any local patches.

I've checked the log of StGIT changes and I see that StGIT does "git
fetch" instead of "git pull" now.  I don't have a .gitconfig file, so I
should get the new default behavior.  I don't see any changes to StGIT
documentations.

The problem is observed with the git repository.  It stays at
e4b0e4ab8ee68df0fa99100640ed5cb54b736141 although
refs/remotes/origin/master has advanced to
aacd404e775ad73188ae9157041d7cc530d5625c.

My guesses what may be happening:

1) "stg pull" is intended not to merge the changes.  In this case, I
expect changes to the documentation and a new command that would merge
the changes.

2) The there is a bug in the implementation of stgit.pull-does-rebase.
We are merging the local refs/heads/master instead of the one from
FETCH_HEAD.  This suspicion is confirmed by the fact that StGIT sources
have no references to FETCH_HEAD, and the only git command that reads it
is git-pull, which we are not calling by default now.

-- 
Regards,
Pavel Roskin

Re: stg pull doesn't pull anymore

[Pavel Roskin]

Hello again!

Sorry for postscript.

The failure of test 4 in t1200-push-modified.sh (that's the StGIT
testsuite) is clearly related to the problem.  The test passes if I
change make test-lib.sh copy my .gitconfig to the new $HOME.  And
my .gitconfig is:

[stgit]
        pullcmd = git-pull
        pull-does-rebase = no

"stg pull" in test 3 doesn't pull anything, and that's why test 4
doesn't produce an expected failure.

Now I'm quite confident that stgit.pull-does-rebase=yes is not working
the way it should.

-- 
Regards,
Pavel Roskin

Re: stg pull doesn't pull anymore

[Yann Dirson]

On Fri, Feb 02, 2007 at 10:44:38PM -0500, Pavel Roskin wrote:
> Now I'm quite confident that stgit.pull-does-rebase=yes is not working
> the way it should.

You're right.  I have mistakenly assumed the branch.*.merge parameter
points to the local ref.  I'll fix it so it takes that as a remote
ref.  Not quite sure how to behave when more than one Fetch: line
reference a single remote branch, though.

Best regards,
-- 
Yann.