Git development
 help / color / mirror / Atom feed
From: Pavel Roskin <proski@gnu.org>
To: git@vger.kernel.org, Yann Dirson <ydirson@altern.org>
Subject: stg pull doesn't pull anymore
Date: Fri, 02 Feb 2007 22:00:47 -0500	[thread overview]
Message-ID: <1170471647.9733.24.camel@dv> (raw)

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

             reply	other threads:[~2007-02-03  3:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-03  3:00 Pavel Roskin [this message]
2007-02-03  3:44 ` stg pull doesn't pull anymore Pavel Roskin
2007-02-03 10:16   ` 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=1170471647.9733.24.camel@dv \
    --to=proski@gnu.org \
    --cc=git@vger.kernel.org \
    --cc=ydirson@altern.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