diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-21 00:45:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-21 00:45:12 +0200 |
| commit | 5f14d2098478cc96251b52d812c5a3ebc3e03a42 (patch) | |
| tree | 6d2e5ad5e0c0649cb863490ca5c73e4c1e076043 /builtin/fetch.c | |
| parent | Merge branch 'gt/unit-test-oidtree' (diff) | |
| parent | update-ref: add support for 'symref-update' command (diff) | |
| download | git-5f14d2098478cc96251b52d812c5a3ebc3e03a42.tar.xz git-5f14d2098478cc96251b52d812c5a3ebc3e03a42.zip | |
Merge branch 'kn/update-ref-symref'
"git update-ref --stdin" learned to handle transactional updates of
symbolic-refs.
* kn/update-ref-symref:
update-ref: add support for 'symref-update' command
reftable: pick either 'oid' or 'target' for new updates
update-ref: add support for 'symref-create' command
update-ref: add support for 'symref-delete' command
update-ref: add support for 'symref-verify' command
refs: specify error for regular refs with `old_target`
refs: create and use `ref_update_expects_existing_old_ref()`
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 0c061b2ed0..693f02b958 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1391,8 +1391,8 @@ static int prune_refs(struct display_state *display_state, if (!dry_run) { if (transaction) { for (ref = stale_refs; ref; ref = ref->next) { - result = ref_transaction_delete(transaction, ref->name, NULL, 0, - "fetch: prune", &err); + result = ref_transaction_delete(transaction, ref->name, NULL, + NULL, 0, "fetch: prune", &err); if (result) goto cleanup; } |