From: Brandon Casey <casey@nrlssc.navy.mil>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Brian Foster <brian.foster@innova-card.com>,
git@vger.kernel.org, Dmitry Potapov <dpotapov@gmail.com>
Subject: Re: fsck --full is Ok, but clones are not, "missing commits"?!
Date: Wed, 16 Apr 2008 11:11:01 -0500 [thread overview]
Message-ID: <48062515.50903@nrlssc.navy.mil> (raw)
In-Reply-To: <480619AE.8010506@viscovery.net>
Johannes Sixt wrote:
> Brian Foster schrieb:
>> at toplevel of a (not-bare) clone, with info/grafts in-place,
>> and a happy `fsck -full' (same machine so same git version):
>>
>> $ git filter-branch --tag-name-filter cat -- --all # at not-bare toplevel
>> Rewrite 7df30811617517bc4d5ec7c190a435667228320c (168/168)
>> Ref 'refs/heads/master' was rewritten
>> Ref 'refs/remotes/origin/HEAD' was rewritten
>> WARNING: Ref 'refs/remotes/origin/master' is unchanged
>> Ref 'refs/tags/linux-2.6.15' was rewritten
>> error: Ref refs/tags/linux-2.6.15 is at \
>> 26a33413c95dfda6c70ca4a83da49cddb7b236b9 but expected \
>> 2dcaaf2decd31ac9a21d616604c0a7c1fa65d5a4
>> fatal: refs/tags/linux-2.6.15: cannot lock the ref
>> Could not rewrite refs/tags/linux-2.6.15
>> $
>
> Actually, I don't know how to overcome this situation; maybe forget about
> the tags and remove the '--tag-name-filter cat' part. They wouldn't have
> been rewritten correctly anyway (annotated tags loose the message and
> become unannotated).
I don't think the tag-name-filter section has been reached yet.
I think the problem is the --all option to rev-parse. This adds everything under
.git/refs to the list of heads to rewrite. Just a guess, but possibly the
linux-2.6.15 is an annotated tag, which is dereferenced to a commit (the oldsha1),
and then when update-ref is called with the newsha1 and the oldsha1, the oldsha1
doesn't match what is in refs/tags/linux-2.6.15 since that points to the sha1 of
the tag object.
Try --branches instead of --all. Or leave it blank if you just want to filter
the current branch.
Also, if you're interested in retaining the annotations from the tags, search the
list for '[PATCH v4] filter-branch.sh: support nearly proper tag name filtering'
or grab the patch from git's pu branch.
-brandon
next prev parent reply other threads:[~2008-04-16 16:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200804161626.44174.brian.foster@innova-card.com>
2008-04-16 15:04 ` fsck --full is Ok, but clones are not, "missing commits"?! Brian Foster
2008-04-16 15:22 ` Johannes Sixt
2008-04-16 16:11 ` Brandon Casey [this message]
[not found] ` <200804171643.15504.brian.foster@innova-card.com>
2008-04-17 14:53 ` Brian Foster
2008-04-17 15:41 ` Brandon Casey
[not found] ` <200804180943.20933.brian.foster@innova-card.com>
2008-04-18 8:41 ` Brian Foster
2008-04-18 8:55 ` Johannes Sixt
[not found] ` <200804181114.47067.brian.foster@innova-card.com>
2008-04-18 9:29 ` Brian Foster
2008-04-16 17:15 ` Dmitry Potapov
[not found] <20080506115224.79802c7c@zebulon.innova-card.com>
2008-05-06 12:17 ` Johannes Sixt
[not found] <200804171756.39911.brian.foster@innova-card.com>
2008-04-17 18:44 ` Brian Foster
[not found] <200804161334.17748.brian.foster@innova-card.com>
2008-04-16 11:48 ` Re: " Brian Foster
2008-04-16 13:22 ` Johannes Sixt
2008-04-16 14:25 ` Dmitry Potapov
2008-04-16 14:56 ` Johannes Sixt
2008-04-16 16:17 ` Dmitry Potapov
2008-04-16 16:47 ` Jakub Narebski
2008-04-17 6:18 ` Johannes Sixt
[not found] <20080416062925.8028e952@zebulon.innova-card.com>
2008-04-16 6:37 ` Brian Foster
2008-04-16 9:14 ` David Kastrup
2008-05-05 4:25 ` Bryan Donlan
[not found] ` <200805051608.55200.brian.foster@innova-card.com>
2008-05-05 14:44 ` Brian Foster
2008-05-05 15:12 ` Johannes Sixt
[not found] ` <200805061231.30135.brian.foster@innova-card.com>
2008-05-06 10:58 ` Brian Foster
2008-05-06 11:12 ` Johannes Sixt
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=48062515.50903@nrlssc.navy.mil \
--to=casey@nrlssc.navy.mil \
--cc=brian.foster@innova-card.com \
--cc=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
/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).