Merge branch 'cc/fix-missing-va-end-in-revert' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:32:43 +0000 (10:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:32:43 +0000 (10:32 -0700)
By Christian Couder
* cc/fix-missing-va-end-in-revert:
revert: add missing va_end

builtin/revert.c
index 92f3fa5f57f289dbc966f5a49c7aedf2ee87e547..5462e676e2151452adae8fe5b0cb42b1a5edff31 100644 (file)
@@ -86,6 +86,7 @@ static void verify_opt_mutually_compatible(const char *me, ...)
                                break;
                }
        }
+       va_end(ap);
 
        if (opt1 && opt2)
                die(_("%s: %s cannot be used with %s"), me, opt1, opt2);