From: Eric Wong <e@80x24.org>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Jeff King <peff@peff.net>, Janos Farkas <chexum@gmail.com>,
git@vger.kernel.org
Subject: [PATCH 2/1] repack: warn if bitmaps are explicitly enabled with keep files
Date: Sat, 29 Jun 2019 19:16:00 +0000 [thread overview]
Message-ID: <20190629191600.nipp2ut37xd3mx56@dcvr> (raw)
In-Reply-To: <87zhm26uq9.fsf@evledraar.gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> I have the feedback I posted before this patch in
> https://public-inbox.org/git/874l4f8h4c.fsf@evledraar.gmail.com/
>
> In particular "b" there since "a" is clearly more work. I.e. shouldn't
> we at least in interactive mode on a "gc" print something about skipping
> what we'd otherwise do.
>
> Maybe that's tricky with the gc.log functionality, but I think we should
> at least document this before the next guy shows up with "sometimes my
> .bitmap files aren't generated...".
I'm not sure if the warning should be present by default;
because we'll silently stop using bitmaps, now. But warning
if '-b' is specified seems right:
-------8<----------
Subject: [PATCH] repack: warn if bitmaps are explicitly enabled with keep
files
If a user explicitly enables bitmaps, we should warn if .keep
files exist or are specified via --keep-pack
Signed-off-by: Eric Wong <e@80x24.org>
---
builtin/repack.c | 8 ++++++++
t/t7700-repack.sh | 16 ++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/builtin/repack.c b/builtin/repack.c
index 73250b2431..b1eeee88a7 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -359,7 +359,15 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
is_bare_repository() &&
keep_pack_list.nr == 0 &&
!has_pack_keep_file();
+ } else if (write_bitmaps > 0) {
+ if (keep_pack_list.nr)
+ fprintf(stderr,
+ _("WARNING: --keep-pack is incompatible with bitmaps\n"));
+ if (has_pack_keep_file())
+ fprintf(stderr,
+ _("WARNING: .keep files are incompatible with bitmaps\n"));
}
+
if (pack_kept_objects < 0)
pack_kept_objects = write_bitmaps;
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 0e9af832c9..839484c7dc 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -249,4 +249,20 @@ test_expect_success 'no bitmaps created if .keep files present' '
test_must_be_empty actual
'
+test_expect_success '-b warns with .keep files present' '
+ pack=$(ls bare.git/objects/pack/*.pack) &&
+ test_path_is_file "$pack" &&
+ keep=${pack%.pack}.keep &&
+ >"$keep" &&
+ git -C bare.git repack -adb 2>err &&
+ test_i18ngrep -F ".keep files are incompatible" err &&
+ rm -f "$keep"
+'
+
+test_expect_success '-b warns with --keep-pack specified' '
+ keep=$(cd bare.git/objects/pack/ && ls *.pack) &&
+ git -C bare.git repack -adb --keep-pack="$keep" 2>err &&
+ test_i18ngrep -F "keep-pack is incompatible" err
+'
+
test_done
--
EW
next prev parent reply other threads:[~2019-06-29 19:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-23 12:15 2.22.0 repack -a duplicating pack contents Janos Farkas
2019-06-23 14:54 ` Ævar Arnfjörð Bjarmason
2019-06-23 15:38 ` Janos Farkas
2019-06-23 18:02 ` Jeff King
2019-06-23 18:08 ` Eric Wong
2019-06-23 22:42 ` Jeff King
2019-06-24 9:30 ` Ævar Arnfjörð Bjarmason
2019-07-03 17:40 ` Jeff King
2019-06-28 7:02 ` [PATCH] repack: disable bitmaps-by-default if .keep files exist Eric Wong
2019-06-28 7:21 ` Ævar Arnfjörð Bjarmason
2019-06-29 19:16 ` Eric Wong [this message]
2019-07-01 18:15 ` [PATCH 2/1] repack: warn if bitmaps are explicitly enabled with keep files Junio C Hamano
2019-07-03 17:38 ` Jeff King
2019-07-03 18:10 ` Junio C Hamano
2019-07-03 18:37 ` Junio C Hamano
2019-07-03 21:24 ` Jeff King
2019-07-03 21:23 ` Jeff King
2019-07-08 17:40 ` Junio C Hamano
2019-06-29 8:03 ` [PATCH] repack: disable bitmaps-by-default if .keep files exist SZEDER Gábor
2019-06-29 19:13 ` [PATCH v2] " Eric Wong
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=20190629191600.nipp2ut37xd3mx56@dcvr \
--to=e@80x24.org \
--cc=avarab@gmail.com \
--cc=chexum@gmail.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).