Merge branch 'rs/maint-config-use-labs' into maint

diff --git a/builtin/tag.c b/builtin/tag.c
index a81b9e4174c77fc10d9f0a37c547723505208c3c..e633f4efdbb8963449fddb5c3357fa657283430e 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -733,8 +733,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
        transaction = ref_transaction_begin(&err);
        if (!transaction ||
            ref_transaction_update(transaction, ref.buf, object, prev,
-                                  0, 1, &err) ||
-           ref_transaction_commit(transaction, NULL, &err))
+                                  0, 1, NULL, &err) ||
+           ref_transaction_commit(transaction, &err))
                die("%s", err.buf);
        ref_transaction_free(transaction);
        if (force && !is_null_sha1(prev) && hashcmp(prev, object))