summaryrefslogtreecommitdiff
path: root/fetch-pack.c
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2020-04-30 19:48:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-30 21:19:13 (GMT)
commitcac4b8e22ee39e52341d718450f8e4055c4dc16f (patch)
treea9f706e5504f65230a96e94fa8f320b518455a07 /fetch-pack.c
parenta4101617688ad504d06b4cc007430c406640e934 (diff)
downloadgit-cac4b8e22ee39e52341d718450f8e4055c4dc16f.zip
git-cac4b8e22ee39e52341d718450f8e4055c4dc16f.tar.gz
git-cac4b8e22ee39e52341d718450f8e4055c4dc16f.tar.bz2
shallow: use struct 'shallow_lock' for additional safety
In previous patches, the functions 'commit_shallow_file' and 'rollback_shallow_file' were introduced to reset the shallowness validity checks on a repository after potentially modifying '.git/shallow'. These functions can be made safer by wrapping the 'struct lockfile *' in a new type, 'shallow_lock', so that they cannot be called with a raw lock (and potentially misused by other code that happens to possess a lockfile, but has nothing to do with shallowness). This patch introduces that type as a thin wrapper around 'struct lockfile', and updates the two aforementioned functions and their callers to use it. Suggested-by: Junio C Hamano <gitster@pobox.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fetch-pack.c')
-rw-r--r--fetch-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index 401d028..27d2d08 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -35,7 +35,7 @@ static int fetch_fsck_objects = -1;
static int transfer_fsck_objects = -1;
static int agent_supported;
static int server_supports_filtering;
-static struct lock_file shallow_lock;
+static struct shallow_lock shallow_lock;
static const char *alternate_shallow_file;
static struct strbuf fsck_msg_types = STRBUF_INIT;