Re: More git pull problems
- From
Petr Baudis <pasky@ucw.cz>
- Date
- Apr 19, 2005, 08:23 UTC
- Message-ID
- <20050419082341.GC2393@pasky.ji.cz>
- In-Reply-To
- <20050419080251.A11988@flint.arm.linux.org.uk>
Dear diary, on Tue, Apr 19, 2005 at 09:02:51AM CEST, I got a letter where Russell King <rmk@arm.linux.org.uk> told me that...
Show 10 quoted lines
> My automatic pull this morning produced the following messages, which > seem to indicate that something's up with git pull now. > > git-pasky-0.4 (7bef49b5d53218ed3fa8bac291b5515c6479810c) > > > New branch: 945a2562ee9e632bc6b3399fd49e028c39d19023 > > Tracked branch, applying changes... > > Fast-forwarding 945a2562ee9e632bc6b3399fd49e028c39d19023 -> 945a2562ee9e632bc6b3399fd49e028c39d19023 > > on top of 945a2562ee9e632bc6b3399fd49e028c39d19023... > > gitdiff.sh: trying to diff 67607f05a66e36b2f038c77cfb61350d2110f7e8 against itself
This means nothing more than you pulled your tracked branch for the first time, but before you already had the latest copy; this wouldn't have happened with subsequent pulls, and it was fixed some time ago - it would be really nice if you could try the new pull and merge.
It is harmless anyway. It got confused and tried to do "zero-length fast forward", which git diff complained about, but it couldn't do any harm (I hope).
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor