Re: [PATCH] Fix pulling into the same branch.

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 11, 2005, 23:15 UTC
Message-ID: <Pine.LNX.4.63.0509120113380.10414@wgmdd8.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vk6hntslb.fsf@assigned-by-dhcp.cox.net>

Hi,

On Sun, 11 Sep 2005, Junio C Hamano wrote:

Show 10 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > On Fri, 26 Aug 2005, Junio C Hamano wrote:
> >
> >> Johannes, what do you think, as the original advocate of "push in
> >> reverse"?
> >
> > I'm fine with it.
> 
> Wow, blast from the past ;-).

Sorry, I tried to relax for two weeks. That didn't work, though (pun intended).

Show 10 quoted lines

> > Although it might make more sense to check for dirty state, and 
> > fast-forward only for a clean state (together with a checkout of the new 
> > HEAD).
> 
> Yes, but the issue becomes how we can reliably tell if a
> repository is naked or has an associated working tree.  I've
> seen people rsync only .git subdirectory of their live working
> tree to publish to a public repository, which means their pulic
> repository has <project>.git/index file, so it is kind of
> tricky.

I think it is easy to discern the two states "up to date checkout" and "dirty checkout or no checkout at all". But then, you're right: git fetch should not touch the working copy.

Ciao, Dscho