From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Michael Henry <git@drmikehenry.com>, git@vger.kernel.org
Subject: [PATCH 5/5] parse-options: use prefix_filename_except_for_dash() helper
Date: Sat, 4 Mar 2023 05:31:47 -0500 [thread overview]
Message-ID: <ZAMeExFKTULOFZF1@coredump.intra.peff.net> (raw)
In-Reply-To: <ZAMb8LSpm2gOrpeY@coredump.intra.peff.net>
Since our fix_filename()'s only remaining special case is handling "-",
we can use the newly-minted helper function that handles this already.
Signed-off-by: Jeff King <peff@peff.net>
---
If we do eventually find that "!file || !*file" is a sign of a bug, we
could perhaps just simplify this whole function away. :)
parse-options.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index 25bae8b585b..6dd4c090e03 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -63,10 +63,8 @@ static void fix_filename(const char *prefix, char **file)
{
if (!file || !*file)
; /* leave as NULL */
- else if (!strcmp("-", *file))
- *file = xstrdup(*file);
else
- *file = prefix_filename(prefix, *file);
+ *file = prefix_filename_except_for_dash(prefix, *file);
}
static enum parse_opt_result opt_command_mode_error(
--
2.40.0.rc1.500.g967c04631e
next prev parent reply other threads:[~2023-03-04 10:31 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-25 12:58 `git bundle create -` may not write to `stdout` Michael Henry
2023-02-26 23:16 ` Jeff King
2023-03-03 22:31 ` Junio C Hamano
2023-03-03 22:54 ` Jeff King
2023-03-03 23:05 ` Junio C Hamano
2023-03-04 1:28 ` Jeff King
2023-03-04 1:46 ` Jeff King
2023-03-04 10:22 ` [PATCH 0/5] handling "-" as stdin/stdout in git bundle Jeff King
2023-03-04 10:26 ` [PATCH 1/5] bundle: let "-" mean stdin for reading operations Jeff King
2023-03-04 10:26 ` [PATCH 2/5] bundle: document handling of "-" as stdin Jeff King
2023-03-04 10:27 ` [PATCH 3/5] bundle: don't blindly apply prefix_filename() to "-" Jeff King
2023-03-04 10:31 ` [PATCH 4/5] parse-options: consistently allocate memory in fix_filename() Jeff King
2023-03-04 10:31 ` Jeff King [this message]
2023-03-04 10:55 ` [RFC/PATCH] bundle: turn on --all-progress-implied by default Jeff King
2023-03-06 3:44 ` Robin H. Johnson
2023-03-06 5:38 ` Jeff King
2023-03-06 9:25 ` Jeff King
2023-03-06 17:41 ` Junio C Hamano
2023-03-06 17:34 ` `git bundle create -` may not write to `stdout` Junio C Hamano
2023-03-04 1:14 ` Junio C Hamano
2023-03-04 1:43 ` Jeff King
2023-03-03 23:59 ` Michael Henry
2023-03-04 2:22 ` Jeff King
2023-03-04 10:08 ` Michael Henry
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZAMeExFKTULOFZF1@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@drmikehenry.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).