On Thu, 19 Jun 2008, Matthias Kestenholz wrote: > Hi, > > I noticed strange behavior while pulling git.git today (this isn't new, > it just occurred to me for the first time today that there is something > wrong going on) > > I run the 'pu' branch most of the time, and do not create a local branch > because 'pu' is constantly rebased. I just run git checkout origin/pu > after pulling (I know I should fetch if I don't want to fetch+merge, but > it's hard to retrain the fingers) > > Although I am on no branch ($curr_branch is empty), I get the error > message from error_on_no_merge_candidates instead of being notified that > I am on no branch currently. Something around line 150-160 in > git-pull.sh does not seem to work as it should. There's no reason you couldn't pull when on no branch. It's just that, without a branch, there's nowhere to get a default ref to merge, which leads to having nothing to merge (if you don't give anything specific), which leads to that error. On the other hand, you could do: git pull <some URL> <some branch> and git would happily merge the specified branch of the specified repository for you. So the reason that git-pull doesn't give you the error you expect is that that's not necessarily an error at all. -Daniel *This .sig left intentionally blank* -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
