mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
a86a2e52c6
commit
e64f13104d
1 changed files with 5 additions and 12 deletions
|
@ -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);
|
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
|
* 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,
|
const git_diff_file *workdir,
|
||||||
void *payload)
|
void *payload)
|
||||||
{
|
{
|
||||||
|
(void) baseline;
|
||||||
|
(void) target;
|
||||||
|
(void) workdir;
|
||||||
|
(void) payload;
|
||||||
|
(void) why;
|
||||||
report_error("File '%s' does not match in working tree", path);
|
report_error("File '%s' does not match in working tree", path);
|
||||||
return 0; /* Continue with checkout */
|
return 0; /* Continue with checkout */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue