git/list[1] front-page[2] threads[3] people[4] search[5] about
 

stg pull doesn't pull anymore

From
PRPavel Roskin <proski@gnu.org>
Date
Feb 3, 2007, 03:00 UTC
Message-ID
<1170471647.9733.24.camel@dv>
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
Next: Pavel Roskin
Message 1 of 3 in “stg pull doesn't pull anymore”
  1. Pavel RoskinFeb 3, 2007
  2. Pavel RoskinFeb 3, 2007
  3. Yann DirsonFeb 3, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.