mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lock_any_ref_for_update(): inline function

Browse Source 
Inline the function at its one remaining caller (which is within
refs.c) and remove it.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2014-12-12 09:57:01 +01:00
committed by Junio C Hamano
parent 0b1e654801
commit 31e07f76a9
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
refs.c
View File

@ -2346,13 +2346,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
return NULL; return NULL;
} }
struct ref_lock *lock_any_ref_for_update(const char *refname,
const unsigned char *old_sha1,
int flags, int *type_p)
{
return lock_ref_sha1_basic(refname, old_sha1, NULL, flags, type_p);
}
/* /*
* Write an entry to the packed-refs file for the specified refname. * Write an entry to the packed-refs file for the specified refname.
* If peeled is non-NULL, write it as the entry's peeled value. * If peeled is non-NULL, write it as the entry's peeled value.
@ -4007,7 +4000,7 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
* reference itself, plus we might need to update the * reference itself, plus we might need to update the
* reference if --updateref was specified: * reference if --updateref was specified:
*/ */
lock = lock_any_ref_for_update(refname, sha1, 0, NULL); lock = lock_ref_sha1_basic(refname, sha1, NULL, 0, NULL);
if (!lock) if (!lock)
return error("cannot lock ref '%s'", refname); return error("cannot lock ref '%s'", refname);
if (!reflog_exists(refname)) { if (!reflog_exists(refname)) {

9
refs.h
View File

@ -181,8 +181,7 @@ extern int is_branch(const char *refname);
extern int peel_ref(const char *refname, unsigned char *sha1); extern int peel_ref(const char *refname, unsigned char *sha1);
/* /*
* Flags controlling lock_any_ref_for_update(), ref_transaction_update(), * Flags controlling ref_transaction_update(), ref_transaction_create(), etc.
* ref_transaction_create(), etc.
* REF_NODEREF: act on the ref directly, instead of dereferencing * REF_NODEREF: act on the ref directly, instead of dereferencing
* symbolic references. * symbolic references.
* REF_DELETING: tolerate broken refs * REF_DELETING: tolerate broken refs
@ -191,12 +190,6 @@ extern int peel_ref(const char *refname, unsigned char *sha1);
*/ */
#define REF_NODEREF 0x01 #define REF_NODEREF 0x01
#define REF_DELETING 0x02 #define REF_DELETING 0x02
/*
* This function sets errno to something meaningful on failure.
*/
extern struct ref_lock *lock_any_ref_for_update(const char *refname,
const unsigned char *old_sha1,
int flags, int *type_p);
/* /*
* Setup reflog before using. Set errno to something meaningful on failure. * Setup reflog before using. Set errno to something meaningful on failure.