Message ID | 65784f85bce943e6a6bf29d7a57bb106aff8226b.1730775908.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | pack-objects: Create an alternative name hash algorithm (recreated) | expand |
On Tue, Nov 05, 2024 at 03:05:04AM +0000, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee <stolee@gmail.com> > > This also adds the '--full-name-hash' option introduced in the previous > change and adds newlines to the synopsis. I think "the previous change" is not quite accurate here, even if you move the implementation to pass through '--full-name-hash' via repack into the second patch. It would be nice to have the option added in 'repack' in the same commit as adjusts the documentation instead of splitting them apart. Thanks, Taylor
On 11/21/24 3:17 PM, Taylor Blau wrote: > On Tue, Nov 05, 2024 at 03:05:04AM +0000, Derrick Stolee via GitGitGadget wrote: >> From: Derrick Stolee <stolee@gmail.com> >> >> This also adds the '--full-name-hash' option introduced in the previous >> change and adds newlines to the synopsis. > > I think "the previous change" is not quite accurate here, even if > you move the implementation to pass through '--full-name-hash' via > repack into the second patch. Ah, I should definitely rearrange the commits. > It would be nice to have the option added in 'repack' in the same commit > as adjusts the documentation instead of splitting them apart. Part of the point of the split was that the synopsis in builtin/repack.c needs more than just the addition of the --full-name-hash option in order to make it match the Documentation synopsis. But you're right, the code change is small enough that these things can be combined. Thanks, -Stolee
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index c902512a9e8..457a793fa89 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -9,7 +9,9 @@ git-repack - Pack unpacked objects in a repository SYNOPSIS -------- [verse] -'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx] +'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] + [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] + [--write-midx] [--full-name-hash] DESCRIPTION ----------- diff --git a/builtin/repack.c b/builtin/repack.c index ab2a2e46b20..e5f53a6eac7 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -39,7 +39,9 @@ static int run_update_server_info = 1; static char *packdir, *packtmp_name, *packtmp; static const char *const git_repack_usage[] = { - N_("git repack [<options>]"), + N_("git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" + "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" + "[--write-midx] [--full-name-hash]"), NULL }; diff --git a/t/t0450/txt-help-mismatches b/t/t0450/txt-help-mismatches index 28003f18c92..c4a15fd0cb8 100644 --- a/t/t0450/txt-help-mismatches +++ b/t/t0450/txt-help-mismatches @@ -45,7 +45,6 @@ rebase remote remote-ext remote-fd -repack reset restore rev-parse