diff options
author | Tomaz Canabrava <tomaz.canabrava@gmail.com> | 2016-03-07 16:55:05 -0300 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2016-03-07 16:44:50 -0800 |
commit | e64f13104d0292d3254c2a8d0441ce4f347e2505 (patch) | |
tree | dc31ea8b89b3bc319aab2fe3c4a2fa4070c27e57 | |
parent | a86a2e52c6f61b1e4ac68b9d78c855158f132d54 (diff) | |
download | subsurface-e64f13104d0292d3254c2a8d0441ce4f347e2505.tar.gz |
Silence warnings in save-git.c
Also, another unused function removed.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | subsurface-core/save-git.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/subsurface-core/save-git.c b/subsurface-core/save-git.c index 310882606..054c7e9b4 100644 --- a/subsurface-core/save-git.c +++ b/subsurface-core/save-git.c @@ -538,18 +538,6 @@ static void create_dive_name(struct dive *dive, struct membuffer *name, struct t tm.tm_hour, tm.tm_min, tm.tm_sec); } -/* Write file at filepath to the git repo with given filename */ -static int blob_insert_fromdisk(git_repository *repo, struct dir *tree, const char *filepath, const char *filename) -{ - int ret; - git_oid blob_id; - - ret = git_blob_create_fromdisk(&blob_id, repo, filepath); - if (ret) - return ret; - return tree_insert(tree->files, filename, 1, &blob_id, GIT_FILEMODE_BLOB); -} - /* * Write a membuffer to the git repo, and free it */ @@ -978,6 +966,11 @@ static int notify_cb(git_checkout_notify_t why, const git_diff_file *workdir, void *payload) { + (void) baseline; + (void) target; + (void) workdir; + (void) payload; + (void) why; report_error("File '%s' does not match in working tree", path); return 0; /* Continue with checkout */ } |