All of lore.kernel.org
 help / color / mirror / Atom feed
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:35:52 +0200	[thread overview]
Message-ID: <20050419083551.GD2393@pasky.ji.cz> (raw)
In-Reply-To: <20050419093113.D13488@flint.arm.linux.org.uk>

Dear diary, on Tue, Apr 19, 2005 at 10:31:13AM CEST, I got a letter
where Russell King <rmk@arm.linux.org.uk> told me that...
> On Tue, Apr 19, 2005 at 10:23:41AM +0200, Petr Baudis wrote:
> > 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.
> 
> That's not the case.  This tree has been sitting around for about 6 days
> now, and every day at 7am it gets a git pull.  One thing which did change
> was the version of git installed, which now has this "fast forwarding"
> feature in.

Yes, the way to store this information changed. But by now, it [the
$orig_head which caused the havoc] is completely informational anyway
and git pull is completely rewritten not to need it for the merging
itself; just for the fancy stuff like showing diff-tree.

If I go for the pull/update change (or even if I don't), I might drop
this information anyway; I basically needed it only before merge-base
was around anyway, so that I would know what tree to use as the merge
base.

> Maybe gitmerge.sh should check whether it needs to do anything before
> attempting to do something?

That's the case with the latest git-pasky night version.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor

      reply	other threads:[~2005-04-19  8:32 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
2005-04-19  8:31     ` Russell King
2005-04-19  8:35       ` Petr Baudis [this message]

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=20050419083551.GD2393@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.