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

gitster · gitster · commit 8939cfb5cf57 · 2012-04-24T14:41:16.000-07:00
By Christian Couder
* cc/fix-missing-va-end-in-revert:
  revert: add missing va_end
diff --git a/builtin/revert.c b/builtin/revert.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ static void verify_opt_mutually_compatible(const char *me, ...)`
`86`	`86`	`break;`
`87`	`87`	`}`
`88`	`88`	`}`
	`89`	`+ va_end(ap);`
`89`	`90`
`90`	`91`	`if (opt1 && opt2)`
`91`	`92`	`die(_("%s: %s cannot be used with %s"), me, opt1, opt2);`