summaryrefslogtreecommitdiffstats
path: root/core/git-access.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-10-18 21:58:04 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-24 09:51:37 -0700
commit255f561afffb26bae5c4de0c5fe2d60effb41103 (patch)
tree7b2987886ad228dfabbbde11aaae933dd903e91d /core/git-access.h
parent694776eed1f88327237240e122e15b274a87994b (diff)
downloadsubsurface-255f561afffb26bae5c4de0c5fe2d60effb41103.tar.gz
git: add device-table to git-parser-state
In analogy to the xml-parser add a device-table to git's parser-state. Currently this is unused. In upcoming commits the git parser will then be changed to add device nodes in this table instead of the global device table. The long-term goal being to detach the parsers from global state and to make dive-import fully undoable. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/git-access.h')
-rw-r--r--core/git-access.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/git-access.h b/core/git-access.h
index 2c99f9e52..30c7b7da6 100644
--- a/core/git-access.h
+++ b/core/git-access.h
@@ -15,13 +15,15 @@ enum remote_transport { RT_OTHER, RT_HTTPS, RT_SSH };
struct git_oid;
struct git_repository;
+struct device_table;
#define dummy_git_repository ((git_repository *)3ul) /* Random bogus pointer, not NULL */
extern struct git_repository *is_git_repository(const char *filename, const char **branchp, const char **remote, bool dry_run);
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 *repo, const char *branch, struct dive_table *table, struct trip_table *trips,
- struct dive_site_table *sites, struct filter_preset_table *filter_presets);
+ struct dive_site_table *sites, struct device_table *devices,
+ struct filter_preset_table *filter_presets);
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;