From: Stephen Hemminger <shemminger@osdl.org>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: git@vger.kernel.org
Subject: git pull for update of netdev fails.
Date: Wed, 20 Sep 2006 08:03:08 -0700 [thread overview]
Message-ID: <20060920080308.673a1e93@localhost.localdomain> (raw)
Jeff, you use branches on the netdev tree, but GIT doesn't seem to like
to sync these up properly. My normal method is to keep a clone'd version
of the netdev tree and use pull to resync it. I don't do any changes
to that tree.
This doesn't work with all the branches for some reason. Is this a git
bug?
$ git pull
Generating pack...
Done counting 666 objects.
Result has 400 objects.
Deltifying 400 objects.
100% (400/400) done
Unpacking 400 objects
Total 400, written 400 (delta 324), reused 0 (delta 0)
100% (400/400) done
* refs/heads/origin: fast forward to branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
from f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a to e478bec0ba0a83a48a0f6982934b6de079e7e6b3
* refs/heads/e100-sbit: does not fast forward to branch 'e100-sbit' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6;
not updating.
A temporary workaround is to prune the offending branches locally
first, but that seems like a hack.
next reply other threads:[~2006-09-20 15:03 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-20 15:03 Stephen Hemminger [this message]
2006-09-20 15:28 ` git pull for update of netdev fails Linus Torvalds
2006-09-20 15:54 ` Petr Baudis
2006-09-20 16:02 ` Johannes Schindelin
2006-09-20 16:07 ` Petr Baudis
2006-09-20 16:19 ` Linus Torvalds
2006-09-20 16:26 ` Linus Torvalds
2006-09-20 16:34 ` Shawn Pearce
2006-09-20 16:49 ` Linus Torvalds
2006-09-20 17:10 ` Shawn Pearce
2006-09-20 21:23 ` Johannes Schindelin
2006-09-20 21:27 ` Shawn Pearce
2006-09-20 21:37 ` Johannes Schindelin
2006-09-20 21:42 ` Junio C Hamano
2006-09-20 21:53 ` Johannes Schindelin
2006-09-20 21:53 ` Shawn Pearce
2006-09-20 21:49 ` Shawn Pearce
2006-09-23 4:18 ` Petr Baudis
2006-09-20 16:28 ` Shawn Pearce
2006-09-20 16:38 ` Linus Torvalds
2006-09-20 21:14 ` Johannes Schindelin
2006-09-20 21:21 ` Shawn Pearce
2006-09-20 21:27 ` Johannes Schindelin
2006-09-20 21:40 ` Shawn Pearce
2006-09-20 22:34 ` Jakub Narebski
2006-09-23 3:44 ` Petr Baudis
2006-09-23 4:00 ` Shawn Pearce
2006-09-23 4:09 ` Petr Baudis
2006-09-23 13:15 ` Catalin Marinas
2006-09-23 13:10 ` Catalin Marinas
2006-09-24 20:54 ` Petr Baudis
2006-09-25 12:47 ` Catalin Marinas
2006-09-20 16:05 ` Junio C Hamano
2006-09-20 16:18 ` Petr Baudis
2006-09-20 16:33 ` Linus Torvalds
2006-09-20 20:01 ` Jakub Narebski
2006-09-20 16:15 ` Linus Torvalds
2006-09-20 16:59 ` Shawn Pearce
2006-09-20 17:34 ` Linus Torvalds
2006-09-20 23:12 ` Krzysztof Halasa
2006-09-20 19:58 ` Jakub Narebski
2006-09-21 9:14 ` Johannes Schindelin
2006-09-20 19:24 ` Jeff Garzik
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=20060920080308.673a1e93@localhost.localdomain \
--to=shemminger@osdl.org \
--cc=git@vger.kernel.org \
--cc=jgarzik@pobox.com \
/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.