Merge branch 'cc/fix-missing-va-end-in-revert' into next

By Christian Couder
* cc/fix-missing-va-end-in-revert:
  revert: add missing va_end
This commit is contained in:
Junio C Hamano
2012-04-23 13:38:25 -07:00

View 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);