remote: bail early from set_head() if missing remote name

In "git remote set-head", we can take varying numbers of arguments
depending on whether we saw the "-d" or "-a" options. But the first
argument is always the remote name.

The current code is somewhat awkward in that it conditionally handles
the remote name up-front like this:

  if (argc)
     remote = ...from argv[0]...

and then only later decides to bail if we do not have the right number
of arguments for the options we saw.

This makes it hard to figure out if "remote" is always set when it needs
to be. Both for humans, but also for compilers; with -Og, gcc complains
that "remote" can be accessed without being initialized (although this
is not true, as we'd always die with a usage message in that case).

Let's instead enforce the presence of the remote argument up front,
which fixes the compiler warning and is easier to understand. It does
mean duplicating the code to print a usage message, but it's a single
line.

Noticed-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Tested-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/remote.c b/builtin/remote.c
index 0d6755bcb71e3db51b2a2b0f7150b66d40000b6e..b6808bb28b0d96c61810e1abbfcd2b8e38b35d5d 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1457,10 +1457,13 @@ static int set_head(int argc, const char **argv, const char *prefix,
        };
        argc = parse_options(argc, argv, prefix, options,
                             builtin_remote_sethead_usage, 0);
-       if (argc) {
-               strbuf_addf(&b_head, "refs/remotes/%s/HEAD", argv[0]);
-               remote = remote_get(argv[0]);
-       }
+
+       /* All modes require at least a remote name. */
+       if (!argc)
+               usage_with_options(builtin_remote_sethead_usage, options);
+
+       strbuf_addf(&b_head, "refs/remotes/%s/HEAD", argv[0]);
+       remote = remote_get(argv[0]);
 
        if (!opt_a && !opt_d && argc == 2) {
                head_name = xstrdup(argv[1]);