Some index-base bug in "next" branch ("git-applymbox"-related?)..
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Apr 12, 2007, 22:43 UTC
- Message-ID
- <Pine.LNX.4.64.0704121533560.4061@woody.linux-foundation.org>
Junio, I've been running "next", because of working on the submodule stuff.
I just did some trivial kernel stuff: applied seven patches, and tried to do a "pull". And whoa, that failed. I get this:
[torvalds@woody linux]$ dotest ~/doit 7 patch(es) to process.
.. all apply fine ..
[torvalds@woody linux]$ git pull master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for_linus remote: Generating pack... ... Unpacking 22 objects 100% (22/22) done Your index is based on '80584ff3b99c36ead7e130e453b3a48b18072d18' commit, but the branch tip you are on is at '6a04de6dbe1772d98fddf5099738d6f508e86e21'
That "80584ff.." commit is the commit *before* the "dotest", and HEAD is (correctly) 6a04de.. that is the end result of the "dotest". That "dotest" thing is just because "git-applymbox" isn't in my brain stem:
[torvalds@woody linux]$ alias dotest alias dotest='git-applymbox -u'
so it's not actually anything strange.
Doing a "git reset" obviously fixed it, but if I didn't know that you had been working on that "index BASE" thing, I would have been very worried.
That index base thing is definitely *not* ready for merging into master yet!
Linus