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>
Ronnie Sahlberg committed
Apr 30, 2014 at 12:22 UTC
db7516ab9f435e3ce86b257c6631fb4d2dfb12ae
11 files changed
+54
-44
branch.c
+2
-2
@@ -285,8 +285,8 @@ void create_branch(const char *head,
285
transaction = ref_transaction_begin(&err);
286
if (!transaction ||
287
ref_transaction_update(transaction, ref.buf, sha1,
288
- null_sha1, 0, !forcing, &err) ||
289
- ref_transaction_commit(transaction, msg, &err))
288
+ null_sha1, 0, !forcing, msg, &err) ||
289
+ ref_transaction_commit(transaction, &err))
290
die("%s", err.buf);
291
ref_transaction_free(transaction);
292
strbuf_release(&err);
builtin/commit.c
+2
-2
@@ -1811,8 +1811,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
1811
ref_transaction_update(transaction, "HEAD", sha1,
1812
current_head
1813
? current_head->object.sha1 : NULL,
1814
- 0, !!current_head, &err) ||
1815
- ref_transaction_commit(transaction, sb.buf, &err)) {
1814
+ 0, !!current_head, sb.buf, &err) ||
1815
+ ref_transaction_commit(transaction, &err)) {
1816
rollback_index_files();
1817
die("%s", err.buf);
1818
}
builtin/receive-pack.c
+3
-2
@@ -842,8 +842,9 @@ static const char *update(struct command *cmd, struct shallow_info *si)
842
transaction = ref_transaction_begin(&err);
843
if (!transaction ||
844
ref_transaction_update(transaction, namespaced_name,
845
- new_sha1, old_sha1, 0, 1, &err) ||
846
- ref_transaction_commit(transaction, "push", &err)) {
845
+ new_sha1, old_sha1, 0, 1, "push",
846
+ &err) ||
847
+ ref_transaction_commit(transaction, &err)) {
848
ref_transaction_free(transaction);
849
850
rp_error("%s", err.buf);
builtin/replace.c
+3
-2
@@ -171,8 +171,9 @@ static int replace_object_sha1(const char *object_ref,
171
172
transaction = ref_transaction_begin(&err);
173
if (!transaction ||
174
- ref_transaction_update(transaction, ref, repl, prev, 0, 1, &err) ||
175
- ref_transaction_commit(transaction, NULL, &err))
174
+ ref_transaction_update(transaction, ref, repl, prev,
175
+ 0, 1, NULL, &err) ||
176
+ ref_transaction_commit(transaction, &err))
177
die("%s", err.buf);
178
179
ref_transaction_free(transaction);
builtin/tag.c
+2
-2
@@ -733,8 +733,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
733
transaction = ref_transaction_begin(&err);
734
if (!transaction ||
735
ref_transaction_update(transaction, ref.buf, object, prev,
736
- 0, 1, &err) ||
737
- ref_transaction_commit(transaction, NULL, &err))
736
+ 0, 1, NULL, &err) ||
737
+ ref_transaction_commit(transaction, &err))
738
die("%s", err.buf);
739
ref_transaction_free(transaction);
740
if (force && !is_null_sha1(prev) && hashcmp(prev, object))
builtin/update-ref.c
+7
-6
@@ -14,6 +14,7 @@ static const char * const git_update_ref_usage[] = {
14
15
static char line_termination = '\n';
16
static int update_flags;
17
+static const char *msg;
18
19
/*
20
* Parse one whitespace- or NUL-terminated, possibly C-quoted argument
@@ -198,7 +199,7 @@ static const char *parse_cmd_update(struct ref_transaction *transaction,
199
die("update %s: extra input: %s", refname, next);
200
201
if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
201
- update_flags, have_old, &err))
202
+ update_flags, have_old, msg, &err))
203
die("%s", err.buf);
204
205
update_flags = 0;
@@ -229,7 +230,7 @@ static const char *parse_cmd_create(struct ref_transaction *transaction,
230
die("create %s: extra input: %s", refname, next);
231
232
if (ref_transaction_create(transaction, refname, new_sha1,
232
- update_flags, &err))
233
+ update_flags, msg, &err))
234
die("%s", err.buf);
235
236
update_flags = 0;
@@ -264,7 +265,7 @@ static const char *parse_cmd_delete(struct ref_transaction *transaction,
265
die("delete %s: extra input: %s", refname, next);
266
267
if (ref_transaction_delete(transaction, refname, old_sha1,
267
- update_flags, have_old, &err))
268
+ update_flags, have_old, msg, &err))
269
die("%s", err.buf);
270
271
update_flags = 0;
@@ -300,7 +301,7 @@ static const char *parse_cmd_verify(struct ref_transaction *transaction,
301
die("verify %s: extra input: %s", refname, next);
302
303
if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
303
- update_flags, have_old, &err))
304
+ update_flags, have_old, msg, &err))
305
die("%s", err.buf);
306
307
update_flags = 0;
@@ -354,7 +355,7 @@ static void update_refs_stdin(struct ref_transaction *transaction)
355
356
int cmd_update_ref(int argc, const char **argv, const char *prefix)
357
{
357
- const char *refname, *oldval, *msg = NULL;
358
+ const char *refname, *oldval;
359
unsigned char sha1[20], oldsha1[20];
360
int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0, flags = 0;
361
struct option options[] = {
@@ -385,7 +386,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
386
if (end_null)
387
line_termination = '\0';
388
update_refs_stdin(transaction);
388
- if (ref_transaction_commit(transaction, msg, &err))
389
+ if (ref_transaction_commit(transaction, &err))
390
die("%s", err.buf);
391
ref_transaction_free(transaction);
392
strbuf_release(&err);
fast-import.c
+4
-4
@@ -1716,8 +1716,8 @@ static int update_branch(struct branch *b)
1716
transaction = ref_transaction_begin(&err);
1717
if (!transaction ||
1718
ref_transaction_update(transaction, b->name, b->sha1, old_sha1,
1719
- 0, 1, &err) ||
1720
- ref_transaction_commit(transaction, msg, &err)) {
1719
+ 0, 1, msg, &err) ||
1720
+ ref_transaction_commit(transaction, &err)) {
1721
ref_transaction_free(transaction);
1722
error("%s", err.buf);
1723
strbuf_release(&err);
@@ -1757,12 +1757,12 @@ static void dump_tags(void)
1757
strbuf_addf(&ref_name, "refs/tags/%s", t->name);
1758
1759
if (ref_transaction_update(transaction, ref_name.buf, t->sha1,
1760
- NULL, 0, 0, &err)) {
1760
+ NULL, 0, 0, msg, &err)) {
1761
failure |= error("%s", err.buf);
1762
goto cleanup;
1763
}
1764
}
1765
- if (ref_transaction_commit(transaction, msg, &err))
1765
+ if (ref_transaction_commit(transaction, &err))
1766
failure |= error("%s", err.buf);
1767
1768
cleanup:
refs.c
+21
-13
@@ -2445,8 +2445,8 @@ static void prune_ref(struct ref_to_prune *r)
2445
transaction = ref_transaction_begin(&err);
2446
if (!transaction ||
2447
ref_transaction_delete(transaction, r->name, r->sha1,
2448
- REF_ISPRUNING, 1, &err) ||
2449
- ref_transaction_commit(transaction, NULL, &err)) {
2448
+ REF_ISPRUNING, 1, NULL, &err) ||
2449
+ ref_transaction_commit(transaction, &err)) {
2450
ref_transaction_free(transaction);
2451
error("%s", err.buf);
2452
strbuf_release(&err);
@@ -2621,8 +2621,8 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
2621
transaction = ref_transaction_begin(&err);
2622
if (!transaction ||
2623
ref_transaction_delete(transaction, refname, sha1, delopt,
2624
- sha1 && !is_null_sha1(sha1), &err) ||
2625
- ref_transaction_commit(transaction, NULL, &err)) {
2624
+ sha1 && !is_null_sha1(sha1), NULL, &err) ||
2625
+ ref_transaction_commit(transaction, &err)) {
2626
error("%s", err.buf);
2627
ref_transaction_free(transaction);
2628
strbuf_release(&err);
@@ -3404,6 +3404,7 @@ struct ref_update {
3404
int have_old; /* 1 if old_sha1 is valid, 0 otherwise */
3405
struct ref_lock *lock;
3406
int type;
3407
+ char *msg;
3408
const char refname[FLEX_ARRAY];
3409
};
3410
@@ -3446,9 +3447,10 @@ void ref_transaction_free(struct ref_transaction *transaction)
3447
if (!transaction)
3448
return;
3449
3449
- for (i = 0; i < transaction->nr; i++)
3450
+ for (i = 0; i < transaction->nr; i++) {
3451
+ free(transaction->updates[i]->msg);
3452
free(transaction->updates[i]);
3451
-
3453
+ }
3454
free(transaction->updates);
3455
free(transaction);
3456
}
@@ -3469,7 +3471,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
3471
const char *refname,
3472
const unsigned char *new_sha1,
3473
const unsigned char *old_sha1,
3472
- int flags, int have_old,
3474
+ int flags, int have_old, const char *msg,
3475
struct strbuf *err)
3476
{
3477
struct ref_update *update;
@@ -3486,13 +3488,15 @@ int ref_transaction_update(struct ref_transaction *transaction,
3488
update->have_old = have_old;
3489
if (have_old)
3490
hashcpy(update->old_sha1, old_sha1);
3491
+ if (msg)
3492
+ update->msg = xstrdup(msg);
3493
return 0;
3494
}
3495
3496
int ref_transaction_create(struct ref_transaction *transaction,
3497
const char *refname,
3498
const unsigned char *new_sha1,
3495
- int flags,
3499
+ int flags, const char *msg,
3500
struct strbuf *err)
3501
{
3502
struct ref_update *update;
@@ -3509,13 +3513,15 @@ int ref_transaction_create(struct ref_transaction *transaction,
3513
hashclr(update->old_sha1);
3514
update->flags = flags;
3515
update->have_old = 1;
3516
+ if (msg)
3517
+ update->msg = xstrdup(msg);
3518
return 0;
3519
}
3520
3521
int ref_transaction_delete(struct ref_transaction *transaction,
3522
const char *refname,
3523
const unsigned char *old_sha1,
3518
- int flags, int have_old,
3524
+ int flags, int have_old, const char *msg,
3525
struct strbuf *err)
3526
{
3527
struct ref_update *update;
@@ -3533,6 +3539,8 @@ int ref_transaction_delete(struct ref_transaction *transaction,
3539
assert(!is_null_sha1(old_sha1));
3540
hashcpy(update->old_sha1, old_sha1);
3541
}
3542
+ if (msg)
3543
+ update->msg = xstrdup(msg);
3544
return 0;
3545
}
3546
@@ -3546,8 +3554,8 @@ int update_ref(const char *action, const char *refname,
3554
t = ref_transaction_begin(&err);
3555
if (!t ||
3556
ref_transaction_update(t, refname, sha1, oldval, flags,
3549
- !!oldval, &err) ||
3550
- ref_transaction_commit(t, action, &err)) {
3557
+ !!oldval, action, &err) ||
3558
+ ref_transaction_commit(t, &err)) {
3559
const char *str = "update_ref failed for ref '%s': %s";
3560
3561
ref_transaction_free(t);
@@ -3593,7 +3601,7 @@ static int ref_update_reject_duplicates(struct ref_update **updates, int n,
3601
}
3602
3603
int ref_transaction_commit(struct ref_transaction *transaction,
3596
- const char *msg, struct strbuf *err)
3604
+ struct strbuf *err)
3605
{
3606
int ret = 0, delnum = 0, i;
3607
const char **delnames;
@@ -3642,7 +3650,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
3650
3651
if (!is_null_sha1(update->new_sha1)) {
3652
ret = write_ref_sha1(update->lock, update->new_sha1,
3645
- msg);
3653
+ update->msg);
3654
update->lock = NULL; /* freed by write_ref_sha1 */
3655
if (ret) {
3656
if (err)
refs.h
+6
-6
@@ -274,8 +274,8 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
274
* The following functions add a reference check or update to a
275
* ref_transaction. In all of them, refname is the name of the
276
* reference to be affected. The functions make internal copies of
277
- * refname, so the caller retains ownership of the parameter. flags
278
- * can be REF_NODEREF; it is passed to update_ref_lock().
277
+ * refname and msg, so the caller retains ownership of these parameters.
278
+ * flags can be REF_NODEREF; it is passed to update_ref_lock().
279
*/
280
281
/*
@@ -292,7 +292,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
292
const char *refname,
293
const unsigned char *new_sha1,
294
const unsigned char *old_sha1,
295
- int flags, int have_old,
295
+ int flags, int have_old, const char *msg,
296
struct strbuf *err);
297
298
/*
@@ -307,7 +307,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
307
int ref_transaction_create(struct ref_transaction *transaction,
308
const char *refname,
309
const unsigned char *new_sha1,
310
- int flags,
310
+ int flags, const char *msg,
311
struct strbuf *err);
312
313
/*
@@ -321,7 +321,7 @@ int ref_transaction_create(struct ref_transaction *transaction,
321
int ref_transaction_delete(struct ref_transaction *transaction,
322
const char *refname,
323
const unsigned char *old_sha1,
324
- int flags, int have_old,
324
+ int flags, int have_old, const char *msg,
325
struct strbuf *err);
326
327
/*
@@ -330,7 +330,7 @@ int ref_transaction_delete(struct ref_transaction *transaction,
330
* problem.
331
*/
332
int ref_transaction_commit(struct ref_transaction *transaction,
333
- const char *msg, struct strbuf *err);
333
+ struct strbuf *err);
334
335
/*
336
* Free an existing transaction and all associated data.
sequencer.c
+2
-2
@@ -252,8 +252,8 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
252
if (!transaction ||
253
ref_transaction_update(transaction, "HEAD",
254
to, unborn ? null_sha1 : from,
255
- 0, 1, &err) ||
256
- ref_transaction_commit(transaction, sb.buf, &err)) {
255
+ 0, 1, sb.buf, &err) ||
256
+ ref_transaction_commit(transaction, &err)) {
257
ref_transaction_free(transaction);
258
error("%s", err.buf);
259
strbuf_release(&sb);
walker.c
+2
-3
@@ -300,14 +300,13 @@ int walker_fetch(struct walker *walker, int targets, char **target,
300
strbuf_addf(&refname, "refs/%s", write_ref[i]);
301
if (ref_transaction_update(transaction, refname.buf,
302
&sha1[20 * i], NULL, 0, 0,
303
+ msg ? msg : "fetch (unknown)",
304
&err)) {
305
error("%s", err.buf);
306
goto done;
307
}
308
}
308
- if (ref_transaction_commit(transaction,
309
- msg ? msg : "fetch (unknown)",
310
- &err)) {
309
+ if (ref_transaction_commit(transaction, &err)) {
310
error("%s", err.buf);
311
goto done;
312
}