diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-26 23:47:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-26 23:47:40 -0800 |
| commit | e8b4029f990907e24fac0e7772ee19ee6dd55c1c (patch) | |
| tree | b3b799be8af66f36bd4a09d0b5ed3d8f03136dab /builtin-pack-objects.c | |
| parent | 268b827d9883e77f395a63e4afa10ebbac10bfcf (diff) | |
| parent | 7dc269230761e32e663d9cd0b6f4c316466a490d (diff) | |
| download | git-e8b4029f990907e24fac0e7772ee19ee6dd55c1c.tar.gz | |
Merge branch 'jc/fsck-reflog'
* jc/fsck-reflog:
Add git-reflog to .gitignore
reflog expire: do not punt on tags that point at non commits.
reflog expire: prune commits that are not incomplete
Don't crash during repack of a reflog with pruned commits.
git reflog expire
Move in_merge_bases() to commit.c
reflog: fix warning message.
Teach git-repack to preserve objects referred to by reflog entries.
Protect commits recorded in reflog from pruning.
add for_each_reflog_ent() iterator
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 807be8c3f8..9e15beb3ba 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -17,7 +17,7 @@ static const char pack_usage[] = "\ git-pack-objects [{ -q | --progress | --all-progress }] \n\ [--local] [--incremental] [--window=N] [--depth=N] \n\ [--no-reuse-delta] [--delta-base-offset] [--non-empty] \n\ - [--revs [--unpacked | --all]*] [--stdout | base-name] \n\ + [--revs [--unpacked | --all]*] [--reflog] [--stdout | base-name] \n\ [<ref-list | <object-list]"; struct object_entry { @@ -1575,6 +1575,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) } if (!strcmp("--unpacked", arg) || !strncmp("--unpacked=", arg, 11) || + !strcmp("--reflog", arg) || !strcmp("--all", arg)) { use_internal_rev_list = 1; if (ARRAY_SIZE(rp_av) - 1 <= rp_ac) |