From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Thomas Rast <trast@student.ethz.ch>,
Franck Bui-Huu <vagabon.xyz@gmail.com>,
Erik Faye-Lund <kusmabite@gmail.com>,
git@vger.kernel.org, j6t@kdbg.org, rene.scharfe@lsrfire.ath.cx
Subject: [PATCH 1/2] upload-archive: drop extra argument to prepare_argv
Date: Tue, 15 Nov 2011 14:46:03 -0500 [thread overview]
Message-ID: <20111115194603.GA19305@sigill.intra.peff.net> (raw)
In-Reply-To: <20111115191832.GA16030@sigill.intra.peff.net>
We pass a "sent_argv" which is an out-parameter to hold the
argv that we were sent over the wire. But we also pass in
the "argv" we got on the command line, which is not used at
all. Drop this useless and confusing parameter.
The parameter was obsoleted by c09cd77e, which moved the
enter_repo function (which looked at argv[1]) out of
prepare_argv and into cmd_upload_archive.
Signed-off-by: Jeff King <peff@peff.net>
---
On Tue, Nov 15, 2011 at 02:18:32PM -0500, Jeff King wrote:
> > Let's just do "static" for now, if we know the array is large enough.
>
> OK, here it is.
And here's the other more invasive cleanup on top (patch 2 is the meaty
one).
builtin/upload-archive.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index f47c0f0..80575b9 100644
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -19,7 +19,7 @@
#define MAX_ARGS (64)
-static void prepare_argv(const char **sent_argv, const char **argv)
+static void prepare_argv(const char **sent_argv)
{
const char *arg_cmd = "argument ";
char *p;
@@ -95,7 +95,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
if (!enter_repo(argv[1], 0))
die("'%s' does not appear to be a git repository", argv[1]);
- prepare_argv(sent_argv, argv);
+ prepare_argv(sent_argv);
if (start_command(&cld)) {
int err = errno;
packet_write(1, "NACK fork failed on the remote side\n");
--
1.7.7.3.8.g38efa
next prev parent reply other threads:[~2011-11-15 19:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-24 16:02 [PATCH v4 0/3] port upload-archive to Windows Erik Faye-Lund
2011-10-24 16:02 ` [PATCH v4 1/3] mingw: move poll out of sys-folder Erik Faye-Lund
2011-10-24 16:02 ` [PATCH v4 2/3] compat/win32/poll.c: upgrade from upstream Erik Faye-Lund
2011-10-24 16:02 ` [PATCH v4 3/3] upload-archive: use start_command instead of fork Erik Faye-Lund
2011-10-24 22:39 ` Jeff King
2011-11-15 10:22 ` Thomas Rast
2011-11-15 10:28 ` Jeff King
2011-11-15 12:11 ` Thomas Rast
2011-11-15 17:37 ` Jeff King
2011-11-15 17:44 ` Erik Faye-Lund
2011-11-15 18:18 ` Jeff King
2011-11-15 18:59 ` Junio C Hamano
2011-11-15 19:18 ` Jeff King
2011-11-15 19:46 ` Jeff King [this message]
2011-11-15 19:49 ` [PATCH] upload-archive: use argv_array for sent parameters Jeff King
2011-11-15 21:30 ` Jeff King
2011-11-15 18:53 ` [PATCH v4 3/3] upload-archive: use start_command instead of fork Andreas Schwab
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=20111115194603.GA19305@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=kusmabite@gmail.com \
--cc=rene.scharfe@lsrfire.ath.cx \
--cc=trast@student.ethz.ch \
--cc=vagabon.xyz@gmail.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).