files_transaction_prepare(): don't leak flags to packed transaction

mhagger · gitster · commit b0ca411051d8 · 2017-11-06T10:31:07.000+09:00
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 &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2594,8 +2594,8 @@ static int files_transaction_prepare(struct ref_store *ref_store,`
`2594`	`2594`
`2595`	`2595`	`ref_transaction_add_update(`
`2596`	`2596`	`packed_transaction, update->refname,`
`2597`		`- update->flags & ~REF_HAVE_OLD,`
`2598`		`- &update->new_oid, &update->old_oid,`
	`2597`	`+ REF_HAVE_NEW \| REF_NODEREF,`
	`2598`	`+ &update->new_oid, NULL,`
`2599`	`2599`	`NULL);`
`2600`	`2600`	`}`
`2601`	`2601`	`}`