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

From: Junio C Hamano <junkio@cox.net>
Date: 2005-09-12 04:41:45
Linus Torvalds <torvalds@osdl.org> writes:

> On Sun, 11 Sep 2005, Junio C Hamano wrote:
>> 
>> Yes, but the issue becomes how we can reliably tell if a
>> repository is naked or has an associated working tree.
>
> You can't "git pull" into a naked thing anyway. And
>
> 	git-read-tree -m -u <old-head> <new-head>
>
> should always do the right thing (ie if there is dirty state that would be
> updated, it will fail gracefully).
>
> Or did I miss something?

No, I just stated my view poorly.

You cannot do pull into a naked one, but you can still fetch
into it.  My comment Johannes was responding to was what to do
when you do 'git fetch' into the repository associated with your
working tree and your branch is fast forwarded.  We obviously
want to prevent it from happening.  However, it is OK to do so
if the fetch is happening into a naked one and I was wondering
if there is a reliable way to tell that situation and allowing
that.


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Mon Sep 12 04:42:23 2005

This archive was generated by hypermail 2.1.8 : 2005-09-12 04:42:25 EST