From: Eugene Prokopiev <prokopiev@stc.donpac.ru>
To: Devel@lists.altlinux.org
Subject: [devel] git-fetch : not updating to non-fast forward branch
Date: Sat, 09 Jun 2007 09:13:44 +0400
Message-ID: <466A3708.3060806@stc.donpac.ru> (raw)
Здравствуйте!
Вот так выглядят ссылки в моем репозитарии dbmail:
$ git-show-ref
a42aa96f31a555c2b20d600cdd6e961c0d9cfb67 refs/heads/dbmail_2_2
d32ebba07c81a2b9481e1c6b032305b6ffd9bea9 refs/heads/srpms
5c6384de1eee3de9e74be9f2d6f4df214b7a0c78 refs/tags/2.2.4-alt1
c93c66303c56ba37e2e88ed591f1fb92f6ce659a refs/tags/dbmail/2.2.4.200704092140
В репозитарии апстрима произошли некоторые изменения: как минимум,
изменилась ссылка refs/heads/dbmail_2_2, т.е. в бранче dbmail_2_2
появились новые коммиты:
$ git-ls-remote http://nfg3.nfgs.net/git/dbmail.git
2cbd4a082d9271aeaf9db778a4f46a84072d6547 refs/heads/backup
613bb8d21ff710b00016c382b83e1721bbdbbf92 refs/heads/dbmail_2_2
9def15d850c51dd469452b1dd2bbf25a2d6949dc refs/heads/iconv
2cbd4a082d9271aeaf9db778a4f46a84072d6547 refs/heads/master
7f87463effc873a5f031ce56adbe36b6b0d840a0 refs/heads/mimechunk
e380630dad15ce1094e823ee467f0b3300fd5b8d refs/heads/origin
2cbd4a082d9271aeaf9db778a4f46a84072d6547 refs/remotes/git-svn
3b6113ef6f5548f962dd4d26e45ac7e54189d1ce refs/tags/v2.2.5rc1
Уже вышедший релиз 2.2.5 тагом не отмечен, ну да ладно, это можно
сделать и самому. Сихронизируюсь с бранчем dbmail_2_2:
$ git-fetch http://nfg3.nfgs.net/git/dbmail.git dbmail_2_2:dbmail_2_2
Fetching refs/heads/dbmail_2_2 from http://nfg3.nfgs.net/git/dbmail.git
using http
walk 613bb8d21ff710b00016c382b83e1721bbdbbf92
...
walk ce5527d8a17725aed4bf18d5aacaf5747175fcef
* refs/heads/dbmail_2_2: not updating to non-fast forward branch
'dbmail_2_2' of http://nfg3.nfgs.net/git/dbmail
old...new: a42aa96...613bb8d
И правда, ссылка refs/heads/dbmail_2_2 в моем репозитарии осталась
прежней. Кто виноват и что делать?
--
С уважением, Прокопьев Евгений
next reply other threads:[~2007-06-09 5:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-09 5:13 Eugene Prokopiev [this message]
2007-06-09 7:24 ` Kirill A. Shutemov
2007-06-09 7:58 ` Eugene Prokopiev
2007-06-09 8:09 ` Kirill A. Shutemov
2007-06-09 8:37 ` Eugene Prokopiev
2007-06-09 8:19 ` Kirill A. Shutemov
2007-06-09 10:11 ` Aleksey Avdeev
2007-06-09 8:21 ` Kirill A. Shutemov
2007-06-09 9:17 ` Eugene Prokopiev
2007-06-09 9:10 ` Kirill A. Shutemov
2007-06-09 10:48 ` Eugene Prokopiev
2007-06-09 17:33 ` Kirill A. Shutemov
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=466A3708.3060806@stc.donpac.ru \
--to=prokopiev@stc.donpac.ru \
--cc=Devel@lists.altlinux.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
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git