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 /fast-import.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 'fast-import.c')
| -rw-r--r-- | fast-import.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fast-import.c b/fast-import.c index fee7906e5..d0bd285a1 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1716,8 +1716,8 @@ static int update_branch(struct branch *b) transaction = ref_transaction_begin(&err); if (!transaction || ref_transaction_update(transaction, b->name, b->sha1, old_sha1, - 0, 1, &err) || - ref_transaction_commit(transaction, msg, &err)) { + 0, 1, msg, &err) || + ref_transaction_commit(transaction, &err)) { ref_transaction_free(transaction); error("%s", err.buf); strbuf_release(&err); @@ -1757,12 +1757,12 @@ static void dump_tags(void) strbuf_addf(&ref_name, "refs/tags/%s", t->name); if (ref_transaction_update(transaction, ref_name.buf, t->sha1, - NULL, 0, 0, &err)) { + NULL, 0, 0, msg, &err)) { failure |= error("%s", err.buf); goto cleanup; } } - if (ref_transaction_commit(transaction, msg, &err)) + if (ref_transaction_commit(transaction, &err)) failure |= error("%s", err.buf); cleanup: |