From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Ronnie Sahlberg <ronniesahlberg@gmail.com>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 23/24] refs.c: don't expose the internal struct ref_lock in the header file
Date: Fri, 12 Dec 2014 09:57:02 +0100 [thread overview]
Message-ID: <1418374623-5566-24-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1418374623-5566-1-git-send-email-mhagger@alum.mit.edu>
From: Stefan Beller <sbeller@google.com>
Now the struct ref_lock is used completely internally, so let's
remove it from the header file.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs.c | 9 +++++++++
refs.h | 9 ---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/refs.c b/refs.c
index 166c0f6..582a051 100644
--- a/refs.c
+++ b/refs.c
@@ -6,6 +6,15 @@
#include "dir.h"
#include "string-list.h"
+struct ref_lock {
+ char *ref_name;
+ char *orig_ref_name;
+ struct lock_file *lk;
+ unsigned char old_sha1[20];
+ int lock_fd;
+ int force_write;
+};
+
/*
* How to handle various characters in refnames:
* 0: An acceptable character for refs
diff --git a/refs.h b/refs.h
index 28e7834..fc88ba6 100644
--- a/refs.h
+++ b/refs.h
@@ -1,15 +1,6 @@
#ifndef REFS_H
#define REFS_H
-struct ref_lock {
- char *ref_name;
- char *orig_ref_name;
- struct lock_file *lk;
- unsigned char old_sha1[20];
- int lock_fd;
- int force_write;
-};
-
/*
* A ref_transaction represents a collection of ref updates
* that should succeed or fail together.
--
2.1.3
next prev parent reply other threads:[~2014-12-12 8:57 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-12 8:56 [PATCH v2 00/24] Add reflog_expire() to the references API Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 01/24] refs.c: make ref_transaction_create a wrapper for ref_transaction_update Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 02/24] refs.c: make ref_transaction_delete " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 03/24] refs.c: add a function to append a reflog entry to a fd Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 04/24] expire_reflog(): it's not an each_ref_fn anymore Michael Haggerty
2014-12-12 18:09 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 05/24] expire_reflog(): rename "ref" parameter to "refname" Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 06/24] expire_reflog(): return early if the reference has no reflog Michael Haggerty
2014-12-12 18:15 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 07/24] expire_reflog(): use a lock_file for rewriting the reflog file Michael Haggerty
2014-12-12 18:57 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 08/24] Extract function should_expire_reflog_ent() Michael Haggerty
2014-12-12 20:02 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 09/24] expire_reflog(): extract two policy-related functions Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 10/24] expire_reflog(): add a "flags" argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 11/24] expire_reflog(): move dry_run to flags argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 12/24] expire_reflog(): move updateref " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 13/24] Rename expire_reflog_cb to expire_reflog_policy_cb Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 14/24] struct expire_reflog_cb: a new callback data type Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 15/24] expire_reflog(): pass flags through to expire_reflog_ent() Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 16/24] expire_reflog(): move verbose to flags argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 17/24] expire_reflog(): move rewrite " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 18/24] Move newlog and last_kept_sha1 to "struct expire_reflog_cb" Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 19/24] expire_reflog(): treat the policy callback data as opaque Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 20/24] reflog_expire(): new function in the reference API Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 21/24] refs.c: remove unlock_ref/close_ref/commit_ref from the refs api Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 22/24] lock_any_ref_for_update(): inline function Michael Haggerty
2014-12-12 20:04 ` Stefan Beller
2014-12-12 8:57 ` Michael Haggerty [this message]
2014-12-12 8:57 ` [PATCH v2 24/24] refs.c: let fprintf handle the formatting Michael Haggerty
2014-12-12 20:58 ` [PATCH v2 00/24] Add reflog_expire() to the references API Junio C Hamano
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=1418374623-5566-24-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=ronniesahlberg@gmail.com \
--cc=sbeller@google.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).