diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-25 11:45:03 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-25 11:45:03 +0400 |
| commit | 130b04ab37d74e574d525df7948b963b13c6bdbf (patch) | |
| tree | a39a6d5e46d3ee24dcc1f2f141efe4f0a20a9581 /builtin-pack-objects.c | |
| parent | a7c1ef3e03985c70aeb0825634471bb6240f4fcb (diff) | |
| parent | 7f3140cd23f126e578ccaaea8c2cebe36824a7ac (diff) | |
Merge branch 'js/maint-graft-unhide-true-parents'
* js/maint-graft-unhide-true-parents:
git repack: keep commits hidden by a graft
Add a test showing that 'git repack' throws away grafted-away parents
Conflicts:
git-repack.sh
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index a27c2f6277..ef4bf6bc14 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -2255,6 +2255,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) die("bad %s", arg); continue; } + if (!strcmp(arg, "--keep-true-parents")) { + grafts_replace_parents = 0; + continue; + } usage(pack_usage); } |