All of lore.kernel.org
 help / color / mirror / Atom feed
From: Josef Wolf <jw@raven.inka.de>
To: git@vger.kernel.org
Subject: error: src refspec refs/heads/master matches more than one.
Date: Fri, 14 Feb 2014 12:31:36 +0100	[thread overview]
Message-ID: <20140214113136.GA17817@raven.inka.de> (raw)

Hello folks,

after some commits to my master branch, I tried to push to the bare upstream
repository and got this error message:

  error: src refspec refs/heads/master matches more than one.

A quick check shows that there's indeed something wrong:

  jw@kiste:/git/scan$ git branch -a | grep master
  * master
    refs/heads/master
    remotes/origin/HEAD -> origin/master
    remotes/origin/master
  jw@kiste:/git/scan$ find .git -name master
  .git/refs/heads/master
  .git/logs/refs/remotes/origin/master
  .git/logs/refs/heads/master
  .git/logs/refs/heads/refs/heads/master
  jw@kiste:/git/scan$ find .git -name master
  .git/refs/heads
  .git/refs/heads/refs/heads
  .git/logs/refs/heads
  .git/logs/refs/heads/refs/heads
  jw@kiste:/git/scan$ find .git -name master

Notice the refs/heads _within_ refs/heads!

Now I wonder how I managed to get into this situation and what's the best way
to recover?

Any ideas?

PS: this is git-1.8.1.4.

-- 
Josef Wolf
jw@raven.inka.de

             reply	other threads:[~2014-02-14 12:00 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-14 11:31 Josef Wolf [this message]
2014-02-14 12:45 ` error: src refspec refs/heads/master matches more than one Andreas Schwab
2014-02-14 12:59   ` Duy Nguyen
2014-02-14 15:16     ` Josef Wolf
2014-02-14 15:35       ` David Kastrup
2014-02-14 16:52         ` Josef Wolf
2014-02-14 16:32     ` Junio C Hamano
2014-02-14 16:52       ` David Kastrup
2014-02-14 19:10         ` Junio C Hamano
2014-02-14 22:53       ` Josef Wolf
2014-02-15  8:53       ` Duy Nguyen
2014-02-17 14:25         ` Ingo Rohloff
2014-02-18 19:03         ` Junio C Hamano
2014-02-18 19:35           ` John Keeping
2014-02-18 19:51             ` Junio C Hamano
2014-02-18 20:01               ` John Keeping
2014-02-20  4:17               ` Michael Haggerty
2014-02-20 18:22                 ` Junio C Hamano
2014-02-18 19:37           ` David Kastrup
2014-02-18 21:47             ` Junio C Hamano
2016-03-23 11:17           ` Duy Nguyen

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=20140214113136.GA17817@raven.inka.de \
    --to=jw@raven.inka.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.