mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-19 09:26:09 +02:00
Code

lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF 

This makes it harder to misread the name as LOCK_NODE_REF.

Suggested-by: Torsten Bögershausen <tboegi@web.de>
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-10-01 12:28:37 +02:00 committed by Junio C Hamano
parent 751bacedaa
commit 47ba4662bf
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/technical/api-lockfile.txt
View File

@ -110,11 +110,11 @@ Flags
The following flags can be passed to `hold_lock_file_for_update` or The following flags can be passed to `hold_lock_file_for_update` or
`hold_lock_file_for_append`: `hold_lock_file_for_append`:
LOCK_NODEREF:: LOCK_NO_DEREF::
Usually symbolic links in the destination path are resolved Usually symbolic links in the destination path are resolved
and the lockfile is created by adding ".lock" to the resolved and the lockfile is created by adding ".lock" to the resolved
path. If `LOCK_NODEREF` is set, then the lockfile is created path. If `LOCK_NO_DEREF` is set, then the lockfile is created
by adding ".lock" to the path argument itself. This option is by adding ".lock" to the path argument itself. This option is
used, for example, when locking a symbolic reference, which used, for example, when locking a symbolic reference, which
for backwards-compatibility reasons can be a symbolic link for backwards-compatibility reasons can be a symbolic link

2
cache.h
View File

@ -583,7 +583,7 @@ struct lock_file {
struct strbuf filename; struct strbuf filename;
}; };
#define LOCK_DIE_ON_ERROR 1 #define LOCK_DIE_ON_ERROR 1
#define LOCK_NODEREF 2 #define LOCK_NO_DEREF 2
extern int unable_to_lock_error(const char *path, int err); extern int unable_to_lock_error(const char *path, int err);
extern void unable_to_lock_message(const char *path, int err, extern void unable_to_lock_message(const char *path, int err,
struct strbuf *buf); struct strbuf *buf);

2
lockfile.c
View File

@ -169,7 +169,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
} }
strbuf_add(&lk->filename, path, pathlen); strbuf_add(&lk->filename, path, pathlen);
if (!(flags & LOCK_NODEREF)) if (!(flags & LOCK_NO_DEREF))
resolve_symlink(&lk->filename); resolve_symlink(&lk->filename);
strbuf_addstr(&lk->filename, LOCK_SUFFIX); strbuf_addstr(&lk->filename, LOCK_SUFFIX);
lk->fd = open(lk->filename.buf, O_RDWR | O_CREAT | O_EXCL, 0666); lk->fd = open(lk->filename.buf, O_RDWR | O_CREAT | O_EXCL, 0666);

2
refs.c
View File

@ -2192,7 +2192,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
lflags = 0; lflags = 0;
if (flags & REF_NODEREF) { if (flags & REF_NODEREF) {
refname = orig_refname; refname = orig_refname;
lflags |= LOCK_NODEREF; lflags |= LOCK_NO_DEREF;
} }
lock->ref_name = xstrdup(refname); lock->ref_name = xstrdup(refname);
lock->orig_ref_name = xstrdup(orig_refname); lock->orig_ref_name = xstrdup(orig_refname);