git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Martin Ågren" <martin.agren@gmail.com>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	git@vger.kernel.org, "Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v2 1/9] files_transaction_prepare(): don't leak flags to packed transaction
Date: Sun,  5 Nov 2017 09:42:01 +0100	[thread overview]
Message-ID: <b8e61183ad5d5c046a9eff75ea0401cf2c2567c6.1509870243.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1509870243.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


  reply	other threads:[~2017-11-05  8:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-05  8:42 [PATCH v2 0/9] Tidy up the constants related to ref_update::flags Michael Haggerty
2017-11-05  8:42 ` Michael Haggerty [this message]
2017-11-05  8:42 ` [PATCH v2 2/9] prune_ref(): call `ref_transaction_add_update()` directly Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 3/9] ref_transaction_update(): die on disallowed flags Michael Haggerty
2017-11-07 20:53   ` Martin Ågren
2017-11-07 22:07     ` Thomas Gummerer
2017-11-05  8:42 ` [PATCH v2 4/9] ref_transaction_add_update(): remove a check Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 5/9] refs: tidy up and adjust visibility of the `ref_update` flags Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 6/9] refs: rename constant `REF_NODEREF` to `REF_NO_DEREF` Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 7/9] refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING` Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 8/9] write_packed_entry(): take `object_id` arguments Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 9/9] refs: update some more docs to use "oid" rather than "sha1" Michael Haggerty

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b8e61183ad5d5c046a9eff75ea0401cf2c2567c6.1509870243.git.mhagger@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=martin.agren@gmail.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).