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/git-access.h | |
| 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/git-access.h')
| -rw-r--r-- | core/git-access.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/git-access.h b/core/git-access.h index 82927b87f..19cdde46a 100644 --- a/core/git-access.h +++ b/core/git-access.h @@ -19,7 +19,7 @@ extern struct git_repository *is_git_repository(const char *filename, const char extern int check_git_sha(const char *filename, git_repository **git_p, const char **branch_p); extern int sync_with_remote(struct git_repository *repo, const char *remote, const char *branch, enum remote_transport rt); extern int git_save_dives(struct git_repository *, const char *, const char *remote, bool select_only); -extern int git_load_dives(struct git_repository *, const char *); +extern int git_load_dives(struct git_repository *repo, const char *branch, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); extern const char *get_sha(git_repository *repo, const char *branch); extern int do_git_save(git_repository *repo, const char *branch, const char *remote, bool select_only, bool create_empty); extern const char *saved_git_id; |