public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Matthias Kestenholz <mk@spinlock•ch>
To: Git Mailing List <git@vger•kernel.org>
Subject: git pull error message woes
Date: Thu, 19 Jun 2008 09:32:53 +0200	[thread overview]
Message-ID: <1213860773.6444.9.camel@localhost> (raw)

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

next             reply	other threads:[~2008-06-19  7:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-19  7:32 Matthias Kestenholz [this message]
2008-06-19 18:57 ` git pull error message woes Daniel Barkalow

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1213860773.6444.9.camel@localhost \
    --to=mk@spinlock$(echo .)ch \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox