summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-10-01 12:28:37 +0200
committerJunio C Hamano <gitster@pobox.com>2014-10-01 13:53:28 -0700
commit47ba4662bfd755829edd24428cf2e4bc492d70a6 (patch)
tree4f04a57b1fda2809d50625524fbe4907880b0854 /lockfile.c
parent751bacedaa507b7b6d10b2c1f48e019a01a8fa6e (diff)
downloadgit-47ba4662bfd755829edd24428cf2e4bc492d70a6.tar.gz
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>
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lockfile.c b/lockfile.c
index cf7f4d0470..a1cc08a5ff 100644
--- 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);