[PATCH v2 2/4] cmd_fetch_pack(): handle non-option arguments outside of the loop
- From
mhagger@alum.mit.edu <mhagger@alum.mit.edu>
- Date
- May 21, 2012, 07:59 UTC
- Message-ID
- <1337587199-21099-3-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1337587199-21099-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>
This makes it more obvious that the code is always executed unless there is an error, and that the first initialization of nr_heads is unnecessary.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- builtin/fetch-pack.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index 7e9d62f..dabf5e9 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -910,7 +910,6 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) packet_trace_identity("fetch-pack"); - nr_heads = 0; heads = NULL; for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -972,14 +971,17 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) } usage(fetch_pack_usage); } - dest = arg; - heads = (char **)(argv + i + 1); - nr_heads = argc - i - 1; break; } - if (!dest) + + if (i < argc) + dest = argv[i++]; + else usage(fetch_pack_usage); + heads = (char **)(argv + i); + nr_heads = argc - i; + if (args.stdin_refs) { /* * Copy refs from cmdline to new growable list, then
-- 1.7.10