diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:05 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:05 +0900 |
| commit | 2f76ebc93ca6bfc2aba1be330aabe391a7d093d2 (patch) | |
| tree | 2aba711da4a334aeaa374345e1714973d1e92315 /builtin/add.c | |
| parent | Merge branch 'sg/t6500-no-redirect-of-stdin' (diff) | |
| parent | lock_file: move static locks into functions (diff) | |
| download | tgif-2f76ebc93ca6bfc2aba1be330aabe391a7d093d2.tar.xz | |
Merge branch 'ma/lockfile-cleanup'
Code clean-up to adjust to a more recent lockfile API convention that
allows lockfile instances kept on the stack.
* ma/lockfile-cleanup:
lock_file: move static locks into functions
lock_file: make function-local locks non-static
refs.c: do not die if locking fails in `delete_pseudoref()`
refs.c: do not die if locking fails in `write_pseudoref()`
t/helper/test-write-cache: clean up lock-handling
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/add.c b/builtin/add.c index c9e2619a9a..8a155dd41e 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -265,8 +265,6 @@ static int edit_patch(int argc, const char **argv, const char *prefix) return 0; } -static struct lock_file lock_file; - static const char ignore_error[] = N_("The following paths are ignored by one of your .gitignore files:\n"); @@ -393,6 +391,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) int add_new_files; int require_pathspec; char *seen = NULL; + struct lock_file lock_file = LOCK_INIT; git_config(add_config, NULL); |