summaryrefslogtreecommitdiff
path: root/src/rebase.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2018-02-08 11:14:48 +0000
committerPatrick Steinhardt <ps@pks.im>2018-06-10 19:34:37 +0200
commitecf4f33a4e327a91496f72816f9f02d923e5af05 (patch)
treebb8eccc9ab0dc8f36a702c8a15ad5ae92429ee07 /src/rebase.c
parent56ffdfc61e37b9e7634c7c73b05d84355bea61cd (diff)
downloadlibgit2-ecf4f33a4e327a91496f72816f9f02d923e5af05.tar.gz
Convert usage of `git_buf_free` to new `git_buf_dispose`
Diffstat (limited to 'src/rebase.c')
-rw-r--r--src/rebase.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/rebase.c b/src/rebase.c
index f1cb22f3f..bc3c5995c 100644
--- a/src/rebase.c
+++ b/src/rebase.c
@@ -116,7 +116,7 @@ done:
if (type != GIT_REBASE_TYPE_NONE && path_out)
*path_out = git_buf_detach(&path);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return 0;
}
@@ -251,9 +251,9 @@ static int rebase_open_merge(git_rebase *rebase)
rebase->onto_name = git_buf_detach(&buf);
done:
- git_buf_free(&cmt);
- git_buf_free(&state_path);
- git_buf_free(&buf);
+ git_buf_dispose(&cmt);
+ git_buf_dispose(&state_path);
+ git_buf_dispose(&buf);
return error;
}
@@ -390,10 +390,10 @@ done:
else
git_rebase_free(rebase);
- git_buf_free(&path);
- git_buf_free(&orig_head_name);
- git_buf_free(&orig_head_id);
- git_buf_free(&onto_id);
+ git_buf_dispose(&path);
+ git_buf_dispose(&orig_head_name);
+ git_buf_dispose(&orig_head_id);
+ git_buf_dispose(&onto_id);
return error;
}
@@ -421,8 +421,8 @@ static int rebase_setupfile(git_rebase *rebase, const char *filename, int flags,
if ((error = git_buf_joinpath(&path, rebase->state_path, filename)) == 0)
error = git_futils_writebuffer(&contents, path.ptr, flags, REBASE_FILE_MODE);
- git_buf_free(&path);
- git_buf_free(&contents);
+ git_buf_dispose(&path);
+ git_buf_dispose(&contents);
return error;
}
@@ -463,7 +463,7 @@ static int rebase_setupfiles_merge(git_rebase *rebase)
}
done:
- git_buf_free(&commit_filename);
+ git_buf_dispose(&commit_filename);
return error;
}
@@ -659,8 +659,8 @@ static int rebase_init_merge(
done:
git_reference_free(head_ref);
git_commit_free(onto_commit);
- git_buf_free(&reflog);
- git_buf_free(&state_path);
+ git_buf_dispose(&reflog);
+ git_buf_dispose(&state_path);
return error;
}
@@ -839,7 +839,7 @@ done:
git_tree_free(parent_tree);
git_commit_free(parent_commit);
git_commit_free(current_commit);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
@@ -1263,9 +1263,9 @@ on_error:
error = -1;
done:
- git_buf_free(&rewritten);
- git_buf_free(&path);
- git_buf_free(&notes_ref);
+ git_buf_dispose(&rewritten);
+ git_buf_dispose(&path);
+ git_buf_dispose(&notes_ref);
return error;
}
@@ -1297,8 +1297,8 @@ static int return_to_orig_head(git_rebase *rebase)
rebase->repo, GIT_HEAD_FILE, rebase->orig_head_name, 1,
head_msg.ptr);
- git_buf_free(&head_msg);
- git_buf_free(&branch_msg);
+ git_buf_dispose(&head_msg);
+ git_buf_dispose(&branch_msg);
git_commit_free(terminal_commit);
git_reference_free(head_ref);
git_reference_free(branch_ref);