On Tue, Jan 28, 2014 at 2:01 PM, Johannes Sixt <j6t@xxxxxxxx> wrote: > Am 28.01.2014 22:21, schrieb David Sharp: >> @@ -738,9 +740,12 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) >> continue; >> } >> if (!strcmp(arg, "--resolve-git-dir")) { >> - const char *gitdir = resolve_gitdir(argv[i+1]); >> + const char *gitdir = argv[++i]; >> if (!gitdir) >> - die("not a gitdir '%s'", argv[i+1]); >> + die("--resolve-git-dir requires an argument"); >> + gitdir = resolve_gitdir(gitdir); >> + if (!gitdir) >> + die("not a gitdir '%s'", argv[i]); >> puts(gitdir); >> continue; >> } > > In this hunk, I don't see where the old code incremented i for the > argument. Was this another bug lurking that is fixed now? Yup. I did notice that too. Should have mentioned it in the description. > > -- Hannes > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html