Re: [PATCH] pull: pull into void by fast-forwarding from empty tree

2013-06-20 Thread Ramkumar Ramachandra
Thomas Rast wrote: > diff --git a/git-pull.sh b/git-pull.sh > index 638aabb..1f84383 100755 > --- a/git-pull.sh > +++ b/git-pull.sh > @@ -266,10 +266,17 @@ case "$merge_head" in > ;; > esac > > +# Pulling into unborn branch: a shorthand for branching off > +# FETCH_HEAD, for lazy typers. >

Re: [PATCH] pull: pull into void by fast-forwarding from empty tree

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 02:36:03PM +0200, Thomas Rast wrote: > The logic for pulling into an unborn branch was originally designed to > be used on a newly-initialized repository (d09e79c, git-pull: allow > pulling into an empty repository, 2006-11-16). It thus did not > initially deal with uncomm

[PATCH] pull: pull into void by fast-forwarding from empty tree

2013-06-20 Thread Thomas Rast
The logic for pulling into an unborn branch was originally designed to be used on a newly-initialized repository (d09e79c, git-pull: allow pulling into an empty repository, 2006-11-16). It thus did not initially deal with uncommitted changes in the unborn branch. The case of an _unstaged_ untrack