diff options
| author | Ronnie Sahlberg <sahlberg@google.com> | 2014-04-30 12:22:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-15 10:47:22 -0700 |
| commit | db7516ab9f435e3ce86b257c6631fb4d2dfb12ae (patch) | |
| tree | 84b452b76a6315511691d30f7e97a2a9388b25c1 /builtin/replace.c | |
| parent | dbdcac7d5c5eea314ec4c318a5e88cff427e9f0e (diff) | |
| download | git-db7516ab9f435e3ce86b257c6631fb4d2dfb12ae.tar.gz git-db7516ab9f435e3ce86b257c6631fb4d2dfb12ae.tar.xz | |
refs.c: pass the ref log message to _create/delete/update instead of _commit
Change the ref transaction API so that we pass the reflog message to the
create/delete/update functions instead of to ref_transaction_commit.
This allows different reflog messages for each ref update in a multi-ref
transaction.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/replace.c')
| -rw-r--r-- | builtin/replace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index 8020db850..85d39b58d 100644 --- 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); |