On Sun, Aug 16, 2009 at 02:30:15PM +0200, Johannes Schindelin wrote:
> > I think it is the opposite; packing _without_ "-l" will create a pack
> > with objects from the alternate; using "-l" suppresses them. Running
> > "git repack -a" should do the trick, I believe (and you need the "-a" to
> > ensure that objects already packed in the repo are re-packed).
>
> Hmm. I really would like a documentation patch, then.
To what? From git-repack(1):
-l
Pass the --local option to git-pack-objects. See git-pack-objects(1).
>From git-pack-objects(1):
--local
This flag is similar to --incremental; instead of ignoring all
packed objects, it only ignores objects that are packed and/or not
in the local object store (i.e. borrowed from an alternate).
So I think the documentation is correct, but for the original poster, it
suffers from two problems:
1. The impact of "-l" in this case is a bit subtle and confusing.
I.e., it is not an obvious "use this flag to break the dependency
on an alternate", but rather "don't use this flag so that you won't
ignore non-local objects when packing". In fact, you don't need to
know about it at all
2. He has to know that "git repack" is the right place to look in the
first place (_and_ he has to figure out that "-l" is what he cares
about and follow the docs to git-pack-objects to find out what it
does).
So I think the best thing is a "by the way, here is how you break this
dependency" closer to where the concept of alternates is defined. I
guess the best part would be under the "-s" flag of git-clone, since
that is presumably how such a situation was created (unless the user is
savvy enough to edit .git/objects/info/alternates themselves, in which
case I think we have to assume they know what they are doing).
So maybe something like this would be enough:
-- >8 --
Subject: [PATCH] docs: mention how to break alternates dependency
A user who has created a repository dependency by using "git
clone -s" does not necessarily know where to look to find
out how to break that dependency. Let's mention it right
under "-s", where they are most likely to find it.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
Documentation/git-clone.txt | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index b14de6c..87fa687 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -72,6 +72,11 @@ These objects may be removed by normal git operations (such as 'git-commit')
which automatically call `git gc --auto`. (See linkgit:git-gc[1].)
If these objects are removed and were referenced by the cloned repository,
then the cloned repository will become corrupt.
++
+To break the dependency of the cloned repository to the source
+repository, run `git repack -a` in the cloned repository, which will
+create a new pack in that repository with all referenced objects,
+including those in the source repository.
--
1.6.4.257.gb8ef
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html