git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 25/33] pack_one_ref(): rename "path" parameter to "refname"
Date: Mon, 22 Apr 2013 21:52:33 +0200	[thread overview]
Message-ID: <1366660361-21831-26-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1366660361-21831-1-git-send-email-mhagger@alum.mit.edu>

Make this function conform to the naming convention established in
65385ef7d4 for the rest of the refs.c file.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/refs.c b/refs.c
index 268c1a0..b41dd5e 100644
--- a/refs.c
+++ b/refs.c
@@ -2003,7 +2003,7 @@ static int do_not_prune(int flags)
 	return (flags & (REF_ISSYMREF|REF_ISPACKED));
 }
 
-static int pack_one_ref(const char *path, const unsigned char *sha1,
+static int pack_one_ref(const char *refname, const unsigned char *sha1,
 			  int flags, void *cb_data)
 {
 	struct pack_refs_cb_data *cb = cb_data;
@@ -2013,27 +2013,27 @@ static int pack_one_ref(const char *path, const unsigned char *sha1,
 	/* Do not pack the symbolic refs */
 	if ((flags & REF_ISSYMREF))
 		return 0;
-	is_tag_ref = !prefixcmp(path, "refs/tags/");
+	is_tag_ref = !prefixcmp(refname, "refs/tags/");
 
 	/* ALWAYS pack refs that were already packed or are tags */
 	if (!(cb->flags & PACK_REFS_ALL) && !is_tag_ref && !(flags & REF_ISPACKED))
 		return 0;
 
-	fprintf(cb->refs_file, "%s %s\n", sha1_to_hex(sha1), path);
+	fprintf(cb->refs_file, "%s %s\n", sha1_to_hex(sha1), refname);
 
-	o = parse_object_or_die(sha1, path);
+	o = parse_object_or_die(sha1, refname);
 	if (o->type == OBJ_TAG) {
-		o = deref_tag(o, path, 0);
+		o = deref_tag(o, refname, 0);
 		if (o)
 			fprintf(cb->refs_file, "^%s\n",
 				sha1_to_hex(o->sha1));
 	}
 
 	if ((cb->flags & PACK_REFS_PRUNE) && !do_not_prune(flags)) {
-		int namelen = strlen(path) + 1;
+		int namelen = strlen(refname) + 1;
 		struct ref_to_prune *n = xcalloc(1, sizeof(*n) + namelen);
 		hashcpy(n->sha1, sha1);
-		strcpy(n->name, path);
+		strcpy(n->name, refname);
 		n->next = cb->ref_to_prune;
 		cb->ref_to_prune = n;
 	}
-- 
1.8.2.1

  parent reply	other threads:[~2013-04-22 20:02 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-22 19:52 [PATCH v2 00/33] Various cleanups around reference packing and peeling Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 01/33] refs: document flags constants REF_* Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 02/33] refs: document the fields of struct ref_value Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 03/33] refs: document do_for_each_ref() and do_one_ref() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 04/33] refs: document how current_ref is used Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 05/33] refs: define constant PEELED_LINE_LENGTH Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 06/33] do_for_each_ref_in_dirs(): remove dead code Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 07/33] get_packed_ref(): return a ref_entry Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 08/33] peel_ref(): use function get_packed_ref() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 09/33] repack_without_ref(): " Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 10/33] refs: extract a function ref_resolves_to_object() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 11/33] refs: extract function peel_object() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 12/33] peel_object(): give more specific information in return value Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 13/33] peel_ref(): fix return value for non-peelable, not-current reference Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 14/33] refs: extract a function peel_entry() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 15/33] refs: change the internal reference-iteration API Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 16/33] t3210: test for spurious error messages for dangling packed refs Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 17/33] repack_without_ref(): silence errors " Michael Haggerty
2013-04-22 22:21   ` Junio C Hamano
2013-04-22 19:52 ` [PATCH v2 18/33] search_ref_dir(): return an index rather than a pointer Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 19/33] refs: change how packed refs are deleted Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 20/33] t3211: demonstrate loss of peeled refs if a packed ref is deleted Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 21/33] repack_without_ref(): write peeled refs in the rewritten file Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 22/33] refs: extract a function write_packed_entry() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 23/33] pack-refs: rename handle_one_ref() to pack_one_ref() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 24/33] pack-refs: merge code from pack-refs.{c,h} into refs.{c,h} Michael Haggerty
2013-04-22 19:52 ` Michael Haggerty [this message]
2013-04-22 19:52 ` [PATCH v2 26/33] refs: use same lock_file object for both ref-packing functions Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 27/33] pack_refs(): change to use do_for_each_entry() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 28/33] refs: inline function do_not_prune() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 29/33] pack_one_ref(): use function peel_entry() Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 30/33] pack_one_ref(): use write_packed_entry() to do the writing Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 31/33] pack_one_ref(): do some cheap tests before a more expensive one Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 32/33] refs: change do_for_each_*() functions to take ref_cache arguments Michael Haggerty
2013-04-22 19:52 ` [PATCH v2 33/33] refs: handle the main ref_cache specially Michael Haggerty
2013-04-22 22:23 ` [PATCH v2 00/33] Various cleanups around reference packing and peeling Junio C Hamano
2013-04-23  9:15   ` [PATCH] fixup! t3210: test for spurious error messages for dangling packed refs Michael Haggerty
2013-04-23 17:50     ` Junio C Hamano
2013-04-24 15:25       ` Michael Haggerty
2013-04-27  5:43         ` 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

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

  git send-email \
    --in-reply-to=1366660361-21831-26-git-send-email-mhagger@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
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 NNTP newsgroup(s).