Re: [PATCH v4 2/2] repack: die on incremental + write-bitmap-index
Am 28.12.2016 um 19:12 schrieb David Turner:
> +static const char incremental_bitmap_conflict_error[] = N_(
> +"Incremental repacks are incompatible with bitmap indexes. Use \n"
The SP before LF could be removed.
> +"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
> +);
The string is marked for translation here...
Show 11 quoted lines
> +
> +
> static int repack_config(const char *var, const char *value, void *cb)
> {
> if (!strcmp(var, "repack.usedeltabaseoffset")) {
> @@ -206,6 +212,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
> if (pack_kept_objects < 0)
> pack_kept_objects = write_bitmaps;
>
> + if (write_bitmaps && !(pack_everything & ALL_INTO_ONE))
> + die(incremental_bitmap_conflict_error);... but then any translations remain unused. This should be
die(_(incremental_bitmap_conflict_error));
-- Hannes
Johannes Sixt <j6t@kdbg.org>