Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nil edge condition for initial commit diff preview. #90

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix nil edge condition for initial commit diff preview. #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions apps/gitrekt/c_src/diff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,10 @@ ERL_NIF_TERM
geef_diff_tree(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
{
int error;
int nums_of_null_tree = 0;
geef_repository *repo;
geef_object *old_tree;
geef_object *new_tree;
geef_object *old_tree = NULL;
geef_object *new_tree = NULL;
geef_diff *diff;
git_diff_options diff_opts;
ERL_NIF_TERM diff_term;
Expand All @@ -214,17 +215,27 @@ geef_diff_tree(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
return enif_make_badarg(env);

if (!enif_get_resource(env, argv[1], geef_object_type, (void **) &old_tree))
return enif_make_badarg(env);
nums_of_null_tree += 1;

if (!enif_get_resource(env, argv[2], geef_object_type, (void **) &new_tree))
return enif_make_badarg(env);
nums_of_null_tree += 1;

if (nums_of_null_tree > 1) {
return enif_make_badarg(env);
}

diff = enif_alloc_resource(geef_diff_type, sizeof(geef_diff));
if (!diff)
return geef_oom(env);

diff_opts = diff_opts_atom2type(env, argv[3]);
error = git_diff_tree_to_tree(&diff->diff, repo->repo, (git_tree *)old_tree->obj, (git_tree *)new_tree->obj, &diff_opts);

if (old_tree == NULL || new_tree == NULL) {
error = git_diff_tree_to_tree(&diff->diff, repo->repo, old_tree ? (git_tree *)old_tree->obj : NULL, new_tree ? (git_tree *)new_tree->obj : NULL, &diff_opts);
} else {
error = git_diff_tree_to_tree(&diff->diff, repo->repo, (git_tree *)old_tree->obj, (git_tree *)new_tree->obj, &diff_opts);
}

if (error < 0) {
enif_release_resource(diff);
return geef_error_struct(env, error);
Expand Down
4 changes: 4 additions & 0 deletions apps/gitrekt/lib/gitrekt/git_agent.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,6 +1224,10 @@ defmodule GitRekt.GitAgent do
end
end

defp fetch_tree(nil, _handle) do
{:ok, %GitTree{oid: <<0::160>>, __ref__: nil}}
end

defp fetch_tree(%GitCommit{__ref__: commit}, _handle) do
case Git.commit_tree(commit) do
{:ok, oid, tree} ->
Expand Down