Merge branch 'jk/checkout-from-tree' into maint

diff --git a/builtin/replace.c b/builtin/replace.c
index 8020db850092691f55df3815173a6eefce0ca6a0..85d39b58d8aa35f0cd644273821ffd047ac50df0 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -171,8 +171,9 @@ static int replace_object_sha1(const char *object_ref,
 
        transaction = ref_transaction_begin(&err);
        if (!transaction ||
-           ref_transaction_update(transaction, ref, repl, prev, 0, 1, &err) ||
-           ref_transaction_commit(transaction, NULL, &err))
+           ref_transaction_update(transaction, ref, repl, prev,
+                                  0, 1, NULL, &err) ||
+           ref_transaction_commit(transaction, &err))
                die("%s", err.buf);
 
        ref_transaction_free(transaction);