From: Petr Baudis <pasky@ucw.cz>
To: Russell King <rmk@arm.linux.org.uk>
Cc: Git <git@vger.kernel.org>
Subject: Re: More git pull problems
Date: Tue, 19 Apr 2005 10:23:41 +0200 [thread overview]
Message-ID: <20050419082341.GC2393@pasky.ji.cz> (raw)
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...
> 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
next prev parent reply other threads:[~2005-04-19 8:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1DNlmx-00029W-L2@flint.arm.linux.org.uk>
2005-04-19 7:02 ` More git pull problems Russell King
2005-04-19 8:23 ` Petr Baudis [this message]
2005-04-19 8:31 ` Russell King
2005-04-19 8:35 ` Petr Baudis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050419082341.GC2393@pasky.ji.cz \
--to=pasky@ucw.cz \
--cc=git@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox