aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-10 10:32:43 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-10 10:32:43 -0700
commit5939c6975aecf57c4d3f073546235253f690c297 (patch)
tree2350c64e0763e6b84fd1cacc1c9409bd8fbb66dc /builtin
parent6331da9707e45b1376cf76c9b823f0b7ee9ae9de (diff)
parent5ba9b5e7e34459b9249816d5d9a868f08f2bfa7c (diff)
downloadgit-5939c6975aecf57c4d3f073546235253f690c297.tar.gz
git-5939c6975aecf57c4d3f073546235253f690c297.tar.xz
Merge branch 'cc/fix-missing-va-end-in-revert' into maint
By Christian Couder * cc/fix-missing-va-end-in-revert: revert: add missing va_end
Diffstat (limited to 'builtin')
-rw-r--r--builtin/revert.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 92f3fa5f5..5462e676e 100644
--- 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);