{"thread":{"id":"4865","subject":"git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.","startedAt":"2006-07-12T22:35:30Z","lastAt":"2006-07-12T22:49:27Z","messageCount":3,"participants":["Daniel Drake","Linus Torvalds"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"23727","messageId":"44B57932.4090708@gentoo.org","threadId":"4865","inReplyTo":null,"subject":"git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.","fromName":"Daniel Drake","fromEmail":"dsd@gentoo.org","sentAt":"2006-07-12T22:35:30Z","receivedAt":"2006-07-12T22:35:30Z","isPatch":false,"sender":{"key":"dsd@gentoo.org","avatar":null},"body":"Hi,\n\nI'm having problems trying to merge one branch into another.\n\n$ git --version\ngit version 1.4.1\n\n$ git branch\n* master\n   origin\n   rf-al7230b\n   softmac-experimental\n\n$ git checkout softmac-experimental\n\n$ git diff\n\n$ git pull . master\nMerging HEAD with fd0fad8005cb8bfee0225ea04595d915639539e1\nMerging:\n9b1099f2d6686397ec6b98725afb62051ca6c421 BSS info change handling\nfd0fad8005cb8bfee0225ea04595d915639539e1 Merge branch 'wireless-dev'\nfound 2 common ancestor(s):\na65c077e5fa4ba6d27f87f26b629a5c36ac8181b Justify the existance of \nbasic/mandatory rate registers\n62fbc2bb68a98d40c53cc07f80e36707e5a84bcc Merge branch \n'softmac-suggest-txrate' into wireless-dev\n   Merging:\n   a65c077e5fa4ba6d27f87f26b629a5c36ac8181b Justify the existance of \nbasic/mandatory rate registers\n   62fbc2bb68a98d40c53cc07f80e36707e5a84bcc Merge branch \n'softmac-suggest-txrate' into wireless-dev\n   found 1 common ancestor(s):\n   19ff9003ab13ff90c55c60a5bb7dd2ddc4d89685 Remove VENDOR_ defines\n   Auto-merging zd_mac.c\ngit-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.\n\n$ git diff\ndiff --git a/Kbuild b/Kbuild\ndiff --git a/zd_chip.c b/zd_chip.c\ndiff --git a/zd_chip.h b/zd_chip.h\ndiff --git a/zd_def.h b/zd_def.h\ndiff --git a/zd_ieee80211.c b/zd_ieee80211.c\ndiff --git a/zd_ieee80211.h b/zd_ieee80211.h\ndiff --git a/zd_mac.c b/zd_mac.c\ndiff --git a/zd_mac.h b/zd_mac.h\ndiff --git a/zd_netdev.c b/zd_netdev.c\ndiff --git a/zd_rf.c b/zd_rf.c\ndiff --git a/zd_rf.h b/zd_rf.h\ndiff --git a/zd_rf_al2230.c b/zd_rf_al2230.c\ndiff --git a/zd_rf_rf2959.c b/zd_rf_rf2959.c\ndiff --git a/zd_usb.c b/zd_usb.c\ndiff --git a/zd_usb.h b/zd_usb.h\ndiff --git a/zd_util.c b/zd_util.c\ndiff --git a/zd_util.h b/zd_util.h\n\nNow, I think I've seen this once or twice before, and I think I solved \nit by checking out all those files listed by \"git diff\" one by one.\n\nHowever, when I try this now, the list produced by \"git diff\" shrinks \nand grows as I check more of them out, and I can't seem to get it down \nto 0 again.\n\nI have also tried the -f flags for checkout and pull, no difference.\n\nWhat's going on?\n\nThanks,\nDaniel\n"},{"id":"23728","messageId":"Pine.LNX.4.64.0607121538300.5623@g5.osdl.org","threadId":"4865","inReplyTo":"44B57932.4090708@gentoo.org","subject":"Re: git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-07-12T22:39:28Z","receivedAt":"2006-07-12T22:39:28Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Wed, 12 Jul 2006, Daniel Drake wrote:\n>\n> git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.\n> \n> $ git diff\n> diff --git a/Kbuild b/Kbuild\n> diff --git a/zd_chip.c b/zd_chip.c\n> diff --git a/zd_chip.h b/zd_chip.h\n> ...\n\nDo \"git update-index --refresh\", does it go away?\n\nAlthough \"git checkout -f\" should also have done it (much more \nexpensively)\n\n\t\tLinus\n"},{"id":"23729","messageId":"44B57C77.1070000@gentoo.org","threadId":"4865","inReplyTo":"Pine.LNX.4.64.0607121538300.5623@g5.osdl.org","subject":"Re: git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.","fromName":"Daniel Drake","fromEmail":"dsd@gentoo.org","sentAt":"2006-07-12T22:49:27Z","receivedAt":"2006-07-12T22:49:27Z","isPatch":false,"sender":{"key":"dsd@gentoo.org","avatar":null},"body":"Linus Torvalds wrote:\n> \n> On Wed, 12 Jul 2006, Daniel Drake wrote:\n>> git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.\n>>\n>> $ git diff\n>> diff --git a/Kbuild b/Kbuild\n>> diff --git a/zd_chip.c b/zd_chip.c\n>> diff --git a/zd_chip.h b/zd_chip.h\n>> ...\n> \n> Do \"git update-index --refresh\", does it go away?\n\nYep, thanks.\n\nDaniel\n"}]}