From: Johannes Sixt <j6t@kdbg.org>
To: David Turner <dturner@twosigma.com>
Cc: git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH v4 2/2] repack: die on incremental + write-bitmap-index
Date: Wed, 28 Dec 2016 23:32:49 +0100 [thread overview]
Message-ID: <65a85e09-63ca-48f8-d842-ee8c292d7c2e@kdbg.org> (raw)
In-Reply-To: <1482948720-21488-2-git-send-email-dturner@twosigma.com>
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...
> +
> +
> 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
prev parent reply other threads:[~2016-12-28 22:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-28 18:11 [PATCH v4 1/2] auto gc: don't write bitmaps for incremental repacks David Turner
2016-12-28 18:12 ` [PATCH v4 2/2] repack: die on incremental + write-bitmap-index David Turner
2016-12-28 22:32 ` Johannes Sixt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=65a85e09-63ca-48f8-d842-ee8c292d7c2e@kdbg.org \
--to=j6t@kdbg.org \
--cc=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).