diff options
| author | René Scharfe <l.s.r@web.de> | 2023-12-06 11:51:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-08 22:39:12 (GMT) |
| commit | 12418008679e3ab6bd57a8b974ac56b7c1bd5315 (patch) | |
| tree | a6679c4e8ed8bdd65366acd09db097a50e322f99 /builtin/repack.c | |
| parent | b3bf4701cf617e5dc76e27f318913c2c76c35334 (diff) | |
| download | git-12418008679e3ab6bd57a8b974ac56b7c1bd5315.zip git-12418008679e3ab6bd57a8b974ac56b7c1bd5315.tar.gz git-12418008679e3ab6bd57a8b974ac56b7c1bd5315.tar.bz2 | |
repack: use die_for_incompatible_opt3() for -A/-k/--cruft
The repack option --keep-unreachable is incompatible with -A, --cruft is
incompatible with -A and -k, and -k is short for --keep-unreachable. So
they are all incompatible with each other.
Use the function for checking three mutually incompatible options,
die_for_incompatible_opt3(), to perform this check in one place and
without repetition. This is shorter and clearer.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/repack.c')
| -rw-r--r-- | builtin/repack.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index edaee4d..c54777b 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -1203,19 +1203,13 @@ int cmd_repack(int argc, const char **argv, const char *prefix) if (delete_redundant && repository_format_precious_objects) die(_("cannot delete packs in a precious-objects repo")); - if (keep_unreachable && - (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE))) - die(_("options '%s' and '%s' cannot be used together"), "--keep-unreachable", "-A"); + die_for_incompatible_opt3(unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE), "-A", + keep_unreachable, "-k/--keep-unreachable", + pack_everything & PACK_CRUFT, "--cruft"); - if (pack_everything & PACK_CRUFT) { + if (pack_everything & PACK_CRUFT) pack_everything |= ALL_INTO_ONE; - if (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)) - die(_("options '%s' and '%s' cannot be used together"), "--cruft", "-A"); - if (keep_unreachable) - die(_("options '%s' and '%s' cannot be used together"), "--cruft", "-k"); - } - if (write_bitmaps < 0) { if (!write_midx && (!(pack_everything & ALL_INTO_ONE) || !is_bare_repository())) |