From: Mike Galbraith <efault@gmx.de>
To: git <git@vger.kernel.org>
Subject: git remote update -> rejected
Date: Tue, 22 Apr 2008 11:48:53 +0200 [thread overview]
Message-ID: <1208857733.4695.37.camel@marge.simson.net> (raw)
Greetings,
Does anyone know what could lead to this? git doesn't have any trouble
(well, hasn't had any yet) with any trees other than x86 and
sched-devel. Nobody but little old me seems to be having this trouble...
git is pulled nearly every day, but checking out older versions doesn't
make any difference (unless i go too far back of course).
marge:..git/linux-2.6 # git remote update
Updating origin
Updating linux-next
Updating stable
Updating x86
>From git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
! [rejected] latest -> x86/latest (non fast forward)
! [rejected] master -> x86/master (non fast forward)
! [rejected] testing -> x86/testing (non fast forward)
Updating sched-devel
>From git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel
! [rejected] for-akpm -> sched-devel/for-akpm (non fast forward)
! [rejected] latest -> sched-devel/latest (non fast forward)
! [rejected] master -> sched-devel/master (non fast forward)
If I rm/add the remote back, all goes fine... until it says rejected.
marge:..git/linux-2.6 # git remote rm x86
marge:..git/linux-2.6 # git remote add x86 git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
marge:..git/linux-2.6 # git remote update
Updating origin
Updating linux-next
Updating stable
Updating sched-devel
Updating x86
>From git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* [new branch] base -> x86/base
* [new branch] for-akpm -> x86/for-akpm
* [new branch] for-linus -> x86/for-linus
* [new branch] latest -> x86/latest
* [new branch] master -> x86/master
* [new branch] origin -> x86/origin
* [new branch] testing -> x86/testing
marge:..git/linux-2.6 #
next reply other threads:[~2008-04-22 9:49 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-22 9:48 Mike Galbraith [this message]
2008-04-22 10:34 ` git remote update -> rejected Jeff King
2008-04-22 10:55 ` Mike Galbraith
2008-04-22 11:11 ` Jeff King
2008-04-22 11:58 ` Johannes Schindelin
2008-04-22 12:56 ` Jeff King
2008-04-22 13:03 ` Johannes Schindelin
2008-04-22 13:09 ` Jeff King
2008-04-22 13:26 ` [PATCH] builtin-remote: resurrect forced updates to tracked branches Johannes Schindelin
2008-04-22 17:00 ` git remote update -> rejected Junio C Hamano
2008-04-22 12:41 ` Teemu Likonen
2008-04-22 12:56 ` Johannes Schindelin
2008-04-22 13:01 ` Jeff King
2008-04-22 13:05 ` Johannes Schindelin
2008-04-22 13:53 ` Paolo Bonzini
2008-04-22 13:39 ` Teemu Likonen
2008-04-22 13:49 ` Johannes Schindelin
2008-04-22 14:04 ` Teemu Likonen
2008-04-22 14:10 ` Paolo Bonzini
2008-04-22 15:08 ` Johannes Schindelin
2008-04-22 15:26 ` Paolo Bonzini
2008-04-22 16:23 ` Paolo Bonzini
2008-04-22 16:42 ` Johannes Schindelin
2008-04-22 16:50 ` Junio C Hamano
2008-04-22 17:23 ` [PATCH] remote add: disallow --master and --mirror with non-bare repositories Johannes Schindelin
2008-04-22 18:45 ` Paolo Bonzini
2008-04-22 18:46 ` [PATCH] remote add: disallow --master and --mirror with non-bare repositories (review) Paolo Bonzini
2008-04-22 22:04 ` Johannes Schindelin
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=1208857733.4695.37.camel@marge.simson.net \
--to=efault@gmx.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).