From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 21 May 2012 07:59:57 +0000 (+0200)
Subject: cmd_fetch_pack(): handle non-option arguments outside of the loop
X-Git-Tag: v1.7.11-rc1~18^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4cc00fcf5daf63648b7fd9382ca3e02033a0e1ec;p=git.git

cmd_fetch_pack(): handle non-option arguments outside of the loop

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 25c79ca8c..5c72226c4 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -909,7 +909,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];
@@ -971,14 +970,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