diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-03-17 22:49:29 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-17 16:50:20 -0700 |
| commit | ed3e68c36a94a14d73c81ef7e2ce27ec3ea24217 (patch) | |
| tree | 59466c90c0dc7c5d56681ab8b57a7694484cc824 /core/file.c | |
| parent | 2042a472303ab33f0fb8a6625d6e69e533dbce43 (diff) | |
| download | subsurface-ed3e68c36a94a14d73c81ef7e2ce27ec3ea24217.tar.gz | |
git: load into arbitrary dive tables
The git parser loads into the global dive table, even if it
is called indirectly via parse_file(). However, parse_file()
may be given a different table. Fix this by extending the
git parser state.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/file.c')
| -rw-r--r-- | core/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/file.c b/core/file.c index abee7c793..b4783f3fc 100644 --- a/core/file.c +++ b/core/file.c @@ -325,7 +325,7 @@ int parse_file(const char *filename, struct dive_table *table, struct trip_table } free(current_sha); if (git) - return git_load_dives(git, branch); + return git_load_dives(git, branch, table, trips, sites); if ((ret = readfile(filename, &mem)) < 0) { /* we don't want to display an error if this was the default file */ |