Public bug reported:
Binary package hint: git-core
Ubuntu release: Ubuntu 8.10
Package version: 1:1.5.6.3-1.1ubuntu2
'git pull' doesn't work. Yesterday, I cloned Linus's kernel tree:
scj...@ailuropoda:~/cfs/kernels/git$ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git linux-2.6
It is unchanged apart from pushing and popping a couple of patches via quilt
(no patches are currently applied.) Today I am attempting to update it:
scj...@ailuropoda:~/cfs/kernels/git/linux-2.6$ git pull
Updating f06da26..4c098bc
Documentation/IO-mapping.txt: needs update
include/linux/netfilter/xt_connmark.h: needs update
include/linux/netfilter/xt_dscp.h: needs update
include/linux/netfilter/xt_mark.h: needs update
include/linux/netfilter/xt_rateest.h: needs update
include/linux/netfilter/xt_tcpmss.h: needs update
include/linux/netfilter_ipv4/ipt_connmark.h: needs update
include/linux/netfilter_ipv4/ipt_dscp.h: needs update
include/linux/netfilter_ipv4/ipt_ecn.h: needs update
include/linux/netfilter_ipv4/ipt_mark.h: needs update
include/linux/netfilter_ipv4/ipt_tcpmss.h: needs update
include/linux/netfilter_ipv4/ipt_tos.h: needs update
include/linux/netfilter_ipv4/ipt_ttl.h: needs update
include/linux/netfilter_ipv6/ip6t_hl.h: needs update
include/linux/netfilter_ipv6/ip6t_mark.h: needs update
net/ipv4/netfilter/ipt_ecn.c: needs update
net/ipv4/netfilter/ipt_ttl.c: needs update
net/ipv6/netfilter/ip6t_hl.c: needs update
net/netfilter/xt_connmark.c: needs update
net/netfilter/xt_dscp.c: needs update
net/netfilter/xt_mark.c: needs update
net/netfilter/xt_rateest.c: needs update
net/netfilter/xt_tcpmss.c: needs update
error: Entry 'arch/x86/kernel/cpu/cpufreq/powernow-k8.c' not uptodate. Cannot
merge.
I rsynced the tree to a machine running 8.04 (git-core
1:1.5.4.3-1ubuntu2) and was able to 'git pull' successfully.
I tried 'git checkout -f' to get rid of any local changes (not that there
should be any) but 'git pull' is still broken:
scj...@ailuropoda:~/cfs/kernels/git/linux-2.6$ git checkout -f
Checking out files: 100% (25410/25410), done.
Your branch is behind the tracked remote branch 'origin/master' by 32 commits,
and can be fast-forwarded.
scj...@ailuropoda:~/cfs/kernels/git/linux-2.6$ git pull
Updating f06da26..4c098bc
Documentation/IO-mapping.txt: needs update
include/linux/netfilter/xt_CONNMARK.h: needs update
include/linux/netfilter/xt_DSCP.h: needs update
include/linux/netfilter/xt_MARK.h: needs update
include/linux/netfilter/xt_RATEEST.h: needs update
include/linux/netfilter/xt_TCPMSS.h: needs update
include/linux/netfilter_ipv4/ipt_CONNMARK.h: needs update
include/linux/netfilter_ipv4/ipt_DSCP.h: needs update
include/linux/netfilter_ipv4/ipt_ECN.h: needs update
include/linux/netfilter_ipv4/ipt_MARK.h: needs update
include/linux/netfilter_ipv4/ipt_TCPMSS.h: needs update
include/linux/netfilter_ipv4/ipt_TOS.h: needs update
include/linux/netfilter_ipv4/ipt_TTL.h: needs update
include/linux/netfilter_ipv6/ip6t_HL.h: needs update
include/linux/netfilter_ipv6/ip6t_MARK.h: needs update
net/ipv4/netfilter/ipt_ECN.c: needs update
net/ipv4/netfilter/ipt_TTL.c: needs update
net/ipv6/netfilter/ip6t_HL.c: needs update
net/netfilter/xt_CONNMARK.c: needs update
net/netfilter/xt_DSCP.c: needs update
net/netfilter/xt_MARK.c: needs update
net/netfilter/xt_RATEEST.c: needs update
net/netfilter/xt_TCPMSS.c: needs update
error: Entry 'arch/x86/kernel/cpu/cpufreq/powernow-k8.c' not uptodate. Cannot
merge.
'git-diff' also shows changes, even after 'git checkout -f'
** Affects: git-core (Ubuntu)
Importance: Undecided
Status: New
--
'git pull' fails with "not uptodate. Cannot merge."
https://bugs.launchpad.net/bugs/327739
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
