From: Brian Foster <brian.foster@innova-card.com>
To: git@vger.kernel.org
Subject: [Q] `git fetch tag NAME' into mirror repo does not update HEAD, what to do?
Date: Thu, 12 Aug 2010 09:54:27 +0200 [thread overview]
Message-ID: <201008120954.27648.brian.foster@innova-card.com> (raw)
Bare repository ORIG's master looks like this:
o--o--o--o--v1--o--v2--o--o--o HEAD
where v1 and v2 are (annotated) tagged commits.
Repository SLAVE is a mirror clone of ORIG which
(very deliberately!) lags behind (i.e., its HEAD
is one of the earlier (and usually tagged) commits
on ORIG). SLAVE's master was like this:
o--o--o--o--v1 HEAD
We wanted to update its HEAD to v2, so did:
git fetch ORIG tag v2
This gave us:
o--o--o--o--v1 HEAD
\
o--v2
It did not update SLAVE's HEAD to v2, which we wanted.
This was worked-around by editing refs/heads/master(?)
but we don't want to do that again (esp. since we got
it wrong the first time (Thank you back-ups!)).
Whilst we want to switch to a push from ORIG to SLAVE
model, until that happens (there are some IT issues),
we are still fetching on SLAVE from ORIG. Hence, how
can we avoid the above issue; that is, what should we
have done? Searching various docs has failed to find
any clew or answer.
There are several GIT versions involved (all(?) are
1.5-ish or later). Below is a script to reproduce
the situation (tested with v1.7.0.2).
cheers!
-blf-
=====(cut here and below)===== demo.sh =====(git version 1.7.0.2)=====
#!/bin/bash
add_new_files() {
touch -- "$@"
git add -- "$@"
git commit -m "Added: $*"
}
set -xe
mkdir ORIG
cd ORIG
git init # ORIG is bare in real case
add_new_files foo
add_new_files bar
git tag -a -m First v1
cd ..
git clone --bare --mirror ORIG SLAVE.git
cd ORIG
add_new_files xyzzy
add_new_files plover
git tag -a -m Update v2
add_new_files stuff
add_new_files more_stuff
cd ../SLAVE.git
git fetch --verbose origin tag v2
# SLAVE's master's HEAD has not changed .... ;-(
git tag -l
git log --oneline master
git log --oneline v2
=====(cut here and above)===== demo.sh =====(git version 1.7.0.2)=====
next reply other threads:[~2010-08-12 8:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-12 7:54 Brian Foster [this message]
2010-08-12 8:33 ` [Q] `git fetch tag NAME' into mirror repo does not update HEAD, what to do? Tomas Carnecky
2010-08-12 10:38 ` Brian Foster
2010-08-12 11:05 ` Tomas Carnecky
2010-08-12 12:16 ` [SOLVED] " Brian Foster
2010-08-12 12:32 ` Tomas Carnecky
2010-08-12 13:22 ` Brian Foster
2010-08-12 13:34 ` Tomas Carnecky
2010-08-13 7:03 ` Brian Foster
2010-08-12 17:02 ` [Q] " Brandon Casey
2010-08-13 7:22 ` Brian Foster
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201008120954.27648.brian.foster@innova-card.com \
--to=brian.foster@innova-card.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).