diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2009-07-23 15:33:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-24 16:10:16 (GMT) |
| commit | 7f3140cd23f126e578ccaaea8c2cebe36824a7ac (patch) | |
| tree | d195e6f3e3002fdd55ef93ed10c087f22514cca3 /Documentation | |
| parent | 1ec648278e3a3e5a04dfaac916f68e2f675ff9ea (diff) | |
| download | git-7f3140cd23f126e578ccaaea8c2cebe36824a7ac.zip git-7f3140cd23f126e578ccaaea8c2cebe36824a7ac.tar.gz git-7f3140cd23f126e578ccaaea8c2cebe36824a7ac.tar.bz2 | |
git repack: keep commits hidden by a graft
When you have grafts that pretend that a given commit has different
parents than the ones recorded in the commit object, it is dangerous
to let 'git repack' remove those hidden parents, as you can easily
remove the graft and end up with a broken repository.
So let's play it safe and keep those parent objects and everything
that is reachable by them, in addition to the grafted parents.
As this behavior can only be triggered by git pack-objects, and as that
command handles duplicate parents gracefully, we do not bother to cull
duplicated parents that may result by using both true and grafted
parents.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pack-objects.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 7d4c1a7..2e49929 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -11,7 +11,8 @@ SYNOPSIS [verse] 'git pack-objects' [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] [--all-progress] - [--revs [--unpacked | --all]*] [--stdout | base-name] < object-list + [--revs [--unpacked | --all]*] [--stdout | base-name] + [--keep-true-parents] < object-list DESCRIPTION @@ -197,6 +198,10 @@ base-name:: to force the version for the generated pack index, and to force 64-bit index entries on objects located above the given offset. +--keep-true-parents:: + With this option, parents that are hidden by grafts are packed + nevertheless. + Author ------ |