{"thread":{"id":"6633","subject":"stg pull doesn't pull anymore","startedAt":"2007-02-03T03:00:47Z","lastAt":"2007-02-03T10:16:22Z","messageCount":3,"participants":["Pavel Roskin","Yann Dirson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"33427","messageId":"1170471647.9733.24.camel@dv","threadId":"6633","inReplyTo":null,"subject":"stg pull doesn't pull anymore","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2007-02-03T03:00:47Z","receivedAt":"2007-02-03T03:00:47Z","isPatch":false,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Hello!\n\nI have noticed that \"stg pull\" doesn't merge the latest changes anymore.\nIt fetches the new branches, but the HEAD remains unchanged.\n\nI'm using the current version of git and StGIT (mast branches of both).\nI don't have any local patches.\n\nI've checked the log of StGIT changes and I see that StGIT does \"git\nfetch\" instead of \"git pull\" now.  I don't have a .gitconfig file, so I\nshould get the new default behavior.  I don't see any changes to StGIT\ndocumentations.\n\nThe problem is observed with the git repository.  It stays at\ne4b0e4ab8ee68df0fa99100640ed5cb54b736141 although\nrefs/remotes/origin/master has advanced to\naacd404e775ad73188ae9157041d7cc530d5625c.\n\nMy guesses what may be happening:\n\n1) \"stg pull\" is intended not to merge the changes.  In this case, I\nexpect changes to the documentation and a new command that would merge\nthe changes.\n\n2) The there is a bug in the implementation of stgit.pull-does-rebase.\nWe are merging the local refs/heads/master instead of the one from\nFETCH_HEAD.  This suspicion is confirmed by the fact that StGIT sources\nhave no references to FETCH_HEAD, and the only git command that reads it\nis git-pull, which we are not calling by default now.\n\n-- \nRegards,\nPavel Roskin\n"},{"id":"33431","messageId":"1170474278.26823.11.camel@dv","threadId":"6633","inReplyTo":"1170471647.9733.24.camel@dv","subject":"Re: stg pull doesn't pull anymore","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2007-02-03T03:44:38Z","receivedAt":"2007-02-03T03:44:38Z","isPatch":false,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Hello again!\n\nSorry for postscript.\n\nThe failure of test 4 in t1200-push-modified.sh (that's the StGIT\ntestsuite) is clearly related to the problem.  The test passes if I\nchange make test-lib.sh copy my .gitconfig to the new $HOME.  And\nmy .gitconfig is:\n\n[stgit]\n        pullcmd = git-pull\n        pull-does-rebase = no\n\n\"stg pull\" in test 3 doesn't pull anything, and that's why test 4\ndoesn't produce an expected failure.\n\nNow I'm quite confident that stgit.pull-does-rebase=yes is not working\nthe way it should.\n\n-- \nRegards,\nPavel Roskin\n"},{"id":"33441","messageId":"20070203101622.GI5362@nan92-1-81-57-214-146.fbx.proxad.net","threadId":"6633","inReplyTo":"1170474278.26823.11.camel@dv","subject":"Re: stg pull doesn't pull anymore","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2007-02-03T10:16:22Z","receivedAt":"2007-02-03T10:16:22Z","isPatch":false,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"On Fri, Feb 02, 2007 at 10:44:38PM -0500, Pavel Roskin wrote:\n> Now I'm quite confident that stgit.pull-does-rebase=yes is not working\n> the way it should.\n\nYou're right.  I have mistakenly assumed the branch.*.merge parameter\npoints to the local ref.  I'll fix it so it takes that as a remote\nref.  Not quite sure how to behave when more than one Fetch: line\nreference a single remote branch, though.\n\nBest regards,\n-- \nYann.\n"}]}