stg pull doesn't pull anymore

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]