commit - 69185643da8c9e26b4e750f5c35826f2fe7baf21
commit + 93ec1b5f61be6b14b8a156395d7cabe098814948
blob - cf366734e6044f881d3e6bab9f46c2e480adc68e
blob + dee4807ee7918fb60d125d610bee740651ad28b7
--- lib/worktree.c
+++ lib/worktree.c
static const struct got_error *
update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
- struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
- struct got_worktree *worktree)
+ struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
{
const struct got_error *err = NULL;
struct got_pathlist_entry *pe;
if (err)
goto done;
- err = update_fileindex_after_commit(&commitable_paths,
- *new_commit_id, fileindex, worktree);
+ err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
+ fileindex);
sync_err = sync_fileindex(fileindex, fileindex_path);
if (sync_err && err == NULL)
err = sync_err;
if (err)
goto done;
- err = update_fileindex_after_commit(&commitable_paths,
- *new_commit_id, fileindex, worktree);
+ err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
+ fileindex);
if (err == NULL) {
/* Prevent out-of-date error when rebasing more commits. */
bbc_arg.base_commit_id = *new_commit_id;