[PATCH 3/6] refs: add rejection detail to the callback function
- From
Karthik Nayak <karthik.188@gmail.com>
- Date
- Jan 14, 2026, 15:40 UTC
- Message-ID
- <20260114-633-regression-lost-diagnostic-message-when-pushing-non-commit-objects-to-refs-heads-v1-3-f5f8b173c501@gmail.com>
- In-Reply-To
- <20260114-633-regression-lost-diagnostic-message-when-pushing-non-commit-objects-to-refs-heads-v1-0-f5f8b173c501@gmail.com>
The previous commit started storing the rejection details alongside the error code for rejected updates. Pass this along to the callback function `ref_transaction_for_each_rejected_update()`. Currently the field is unused, but will be integrated in the upcoming commits.
Co-authored-by: Jeff King <peff@peff.net> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/fetch.c | 1 + builtin/receive-pack.c | 1 + builtin/update-ref.c | 1 + refs.c | 2 +- refs.h | 1 + 5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index 288d3772ea..d427adea61 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1649,6 +1649,7 @@ static void ref_transaction_rejection_handler(const char *refname, const char *old_target UNUSED, const char *new_target UNUSED, enum ref_transaction_error err, + const char *details UNUSED, void *cb_data) { struct ref_rejection_data *data = cb_data; diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index ef1f77be8c..94d3e73cee 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1813,6 +1813,7 @@ static void ref_transaction_rejection_handler(const char *refname, const char *old_target UNUSED, const char *new_target UNUSED, enum ref_transaction_error err, + const char *details UNUSED, void *cb_data) { struct strmap *failed_refs = cb_data; diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 195437e7c6..0046a87c57 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -573,6 +573,7 @@ static void print_rejected_refs(const char *refname, const char *old_target, const char *new_target, enum ref_transaction_error err, + const char *details UNUSED, void *cb_data UNUSED) { struct strbuf sb = STRBUF_INIT; diff --git a/refs.c b/refs.c index 991bd8e6ee..ad1898598f 100644 --- a/refs.c +++ b/refs.c @@ -2880,7 +2880,7 @@ void ref_transaction_for_each_rejected_update(struct ref_transaction *transactio (update->flags & REF_HAVE_OLD) ? &update->old_oid : NULL, (update->flags & REF_HAVE_NEW) ? &update->new_oid : NULL, update->old_target, update->new_target, - update->rejection_err, cb_data); + update->rejection_err, update->rejection_details, cb_data); } } diff --git a/refs.h b/refs.h index d9051bbb04..4fbe3da924 100644 --- a/refs.h +++ b/refs.h @@ -975,6 +975,7 @@ typedef void ref_transaction_for_each_rejected_update_fn(const char *refname, const char *old_target, const char *new_target, enum ref_transaction_error err, + const char *details, void *cb_data); void ref_transaction_for_each_rejected_update(struct ref_transaction *transaction, ref_transaction_for_each_rejected_update_fn cb,
-- 2.51.2