* git pull error message woes
@ 2008-06-19 7:32 Matthias Kestenholz
2008-06-19 18:57 ` Daniel Barkalow
0 siblings, 1 reply; 2+ messages in thread
From: Matthias Kestenholz @ 2008-06-19 7:32 UTC (permalink / raw)
To: Git Mailing List
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.
The reason might be, that every line in .git/FETCH_HEAD is marked as
not-for-merge?
I don't know if that's the sign of a deeper problem or if it's just
confusing behavior.
I tried fixing it myself, but got lost somewhere in the fetch machinery.
Matthias
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git pull error message woes
2008-06-19 7:32 git pull error message woes Matthias Kestenholz
@ 2008-06-19 18:57 ` Daniel Barkalow
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Barkalow @ 2008-06-19 18:57 UTC (permalink / raw)
To: Matthias Kestenholz; +Cc: Git Mailing List
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*
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-06-19 18:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-19 7:32 git pull error message woes Matthias Kestenholz
2008-06-19 18:57 ` Daniel Barkalow
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox