lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF

mhagger · gitster · commit 47ba4662bfd7 · 2014-10-01T13:53:28.000-07:00
This makes it harder to misread the name as LOCK_NODE_REF.

Suggested-by: Torsten Bögershausen &lt;tboegi@web.de&gt;
Signed-off-by: Michael Haggerty &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/technical/api-lockfile.txt b/Documentation/technical/api-lockfile.txt
@@ -110,11 +110,11 @@ Flags
 The following flags can be passed to `hold_lock_file_for_update` or
 `hold_lock_file_for_append`:
 
-LOCK_NODEREF::
+LOCK_NO_DEREF::
 
 	Usually symbolic links in the destination path are 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
 	used, for example, when locking a symbolic reference, which
 	for backwards-compatibility reasons can be a symbolic link
diff --git a/cache.h b/cache.h
@@ -583,7 +583,7 @@ struct lock_file {
 	struct strbuf filename;
 };
 #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 void unable_to_lock_message(const char *path, int err,
 				   struct strbuf *buf);
diff --git a/lockfile.c b/lockfile.c
@@ -169,7 +169,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
 	}
 
 	strbuf_add(&lk->filename, path, pathlen);
-	if (!(flags & LOCK_NODEREF))
+	if (!(flags & LOCK_NO_DEREF))
 		resolve_symlink(&lk->filename);
 	strbuf_addstr(&lk->filename, LOCK_SUFFIX);
 	lk->fd = open(lk->filename.buf, O_RDWR | O_CREAT | O_EXCL, 0666);
diff --git a/refs.c b/refs.c
@@ -2192,7 +2192,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
 	lflags = 0;
 	if (flags & REF_NODEREF) {
 		refname = orig_refname;
-		lflags |= LOCK_NODEREF;
+		lflags |= LOCK_NO_DEREF;
 	}
 	lock->ref_name = xstrdup(refname);
 	lock->orig_ref_name = xstrdup(orig_refname);

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ static int lock_file(struct lock_file lk, const char path, int flags)`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`strbuf_add(&lk->filename, path, pathlen);`
`172`		`- if (!(flags & LOCK_NODEREF))`
	`172`	`+ if (!(flags & LOCK_NO_DEREF))`
`173`	`173`	`resolve_symlink(&lk->filename);`
`174`	`174`	`strbuf_addstr(&lk->filename, LOCK_SUFFIX);`
`175`	`175`	`lk->fd = open(lk->filename.buf, O_RDWR \| O_CREAT \| O_EXCL, 0666);`
Original file line number	Diff line number	Diff line change
`@@ -2192,7 +2192,7 @@ static struct ref_lock lock_ref_sha1_basic(const char refname,`
`2192`	`2192`	`lflags = 0;`
`2193`	`2193`	`if (flags & REF_NODEREF) {`
`2194`	`2194`	`refname = orig_refname;`
`2195`		`- lflags \|= LOCK_NODEREF;`
	`2195`	`+ lflags \|= LOCK_NO_DEREF;`
`2196`	`2196`	`}`
`2197`	`2197`	`lock->ref_name = xstrdup(refname);`
`2198`	`2198`	`lock->orig_ref_name = xstrdup(orig_refname);`