[PATCH 1/7] files_transaction_prepare(): don't leak flags to packed transaction
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Oct 28, 2017, 09:49 UTC
- Message-ID
- <b8e61183ad5d5c046a9eff75ea0401cf2c2567c6.1509183413.git.mhagger@alum.mit.edu>
- In-Reply-To
- <cover.1509183413.git.mhagger@alum.mit.edu>
The files backend uses `ref_update::flags` for several internal flags. But those flags have no meaning to the packed backend. So when adding updates for the packed-refs transaction, only use flags that make sense to the packed backend.
`REF_NODEREF` is part of the public interface, and it's logically what we want, so include it. In fact it is actually ignored by the packed backend (which doesn't support symbolic references), but that's its own business.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- refs/files-backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c index 2bd54e11ae..fadf1036d3 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -2594,8 +2594,8 @@ static int files_transaction_prepare(struct ref_store *ref_store, ref_transaction_add_update( packed_transaction, update->refname, - update->flags & ~REF_HAVE_OLD, - &update->new_oid, &update->old_oid, + REF_HAVE_NEW | REF_NODEREF, + &update->new_oid, NULL, NULL); } }
-- 2.14.1