On Fri, Mar 03, 2023 at 08:46:24PM -0500, Jeff King wrote:
> > I wasn't thinking of changing the behavior for input, but just focusing
> > the docs in the right spot (the "create" option), like:
>
> Oh, hmph. I didn't realize that both my patch and yours are touching a
> shared options-parser that affects both reading and writing. So the
> patch by itself is fixing "git bundle create -" but breaking "git bundle
> verify -". We either need to teach the reading side to handle "-", or we
> have to teach parse_options_cmd_bundle() to handle the two cases
> differently.
So here's a potential series. It does teach "-" to the reading side.
Which is technically a behavior change, but one that I hope people will
find pretty reasonable.
The patches are:
[1/5]: bundle: let "-" mean stdin for reading operations
Does what it says. I did it as a preparatory patch before yours, so
that there's never a state where we are treating "-" as special for
prefixing but it doesn't actually work yet. :-/
[2/5]: bundle: document handling of "-" as stdin
One half of the doc-fixes discussed earlier, but of course covering
all operations now.
[3/5]: bundle: don't blindly apply prefix_filename() to "-"
Your patch, but rebased and with the comment above fix_filename()
dropped (since it's handled below). I saw you prepared yours on
"maint". I did this one on "master", because some of the
leak-handling in the other patches needs it. Since this has been
broken for ages, and since "master" is about to become "maint" when
2.40 release in a few days, it seemed simpler to just wait. But if
we really want to, I think we could reorder and split it into two
topics.
[4/5]: parse-options: consistently allocate memory in fix_filename()
Leak-fixes that also get us ready for using your new helper. :)
[5/5]: parse-options: use prefix_filename_except_for_dash() helper
And using the new helper. This could arguably be squashed into 4,
but I wasn't sure at the outset what order to do it in (another
option is putting 4 earlier, and then just converting it over in
your patch 3).
Documentation/git-bundle.txt | 8 +++++---
abspath.c | 7 +++++++
builtin/archive.c | 3 ++-
builtin/bundle.c | 28 +++++++++++++++++++++++-----
builtin/checkout.c | 3 ++-
builtin/reset.c | 4 +++-
builtin/tag.c | 4 +++-
cache.h | 3 +++
parse-options.c | 12 ++++++------
t/helper/test-parse-pathspec-file.c | 3 ++-
t/t6020-bundle-misc.sh | 26 ++++++++++++++++++++++++++
11 files changed, 82 insertions(+), 19 deletions(-)
-Peff
