From: "Tilo Schwarz" <tilo@tilo-schwarz.de>
To: git@vger.kernel.org
Subject: Problem: fatal oops during git fetch
Date: Wed, 13 Jan 2010 23:03:43 +0100 [thread overview]
Message-ID: <op.u6hrkho1a8ed4e@dellschleppa> (raw)
Dear List,
git really rocks!
Nevertheless, yesterday I stumbled into a problem, I don't understand. I
use git for a software projekt, where up to five different computers are
involved. On each computer the same git repository is used, main
development happens on one machine, but bug fixes happens also on the
other machines. Transfer medium is a USB stick, which I use with 'git
fetch', 'git merge' and 'git push'. More than one year nothing strange
happened.
Yesterday I tried to fetch bug fixes from one remote machine to the main
development machine being on branch 'test' using
git fetch remote/test
I got something like
fatal: oops 'SHA1'
Fetch failed
Any ideas what happened here?
I tried various things to fix this without success. I ended up doing 'git
cherry-pick' manually on the 5 commits I needed from remote/test, then
discarded remote/test and pushed my local 'test' to remote. I remember,
that maybe a branch was involved, which was already merged on a remote
machine, but not on the main machine. But up to now git always resolved
these things automagically.
As a side remark: I wished, the error message would have been a litte bit
more detailed. My attempts to make any google sense out of something like
'git fetch fatal oops' failed.
Regards,
Tilo
next reply other threads:[~2010-01-13 22:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-13 22:03 Tilo Schwarz [this message]
2010-01-14 5:28 ` Problem: fatal oops during git fetch Dmitry Potapov
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=op.u6hrkho1a8ed4e@dellschleppa \
--to=tilo@tilo-schwarz.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).