Merge branch 'maint-2.9' into maint-2.10

diff --git a/parse-options-cb.c b/parse-options-cb.c
index 9667bc75a08e8b64290f5f44c92b0bac35d1d0fa..16818830e97e099286f3aa259378de1b8e9fc322 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -199,8 +199,7 @@ int parse_opt_passthru(const struct option *opt, const char *arg, int unset)
        if (recreate_opt(&sb, opt, arg, unset) < 0)
                return -1;
 
-       if (*opt_value)
-               free(*opt_value);
+       free(*opt_value);
 
        *opt_value = strbuf_detach(&sb, NULL);