Commit c2e43fb1f2254237a20a9f2a4383ec7eb613a36c
2012-10-18T16:50:55
diff: workdir diffing in a bare repo returns EBAREREPO
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
diff --git a/src/diff.c b/src/diff.c
index 7f500b8..9f693be 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -933,12 +933,14 @@ int git_diff_workdir_to_index(
git_diff_list **diff)
{
git_iterator *a = NULL, *b = NULL;
+ int error;
+
char *prefix = opts ? diff_prefix_from_pathspec(&opts->pathspec) : NULL;
assert(repo && diff);
- if (git_iterator_for_index_range(&a, repo, prefix, prefix) < 0 ||
- git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0)
+ if ((error = git_iterator_for_index_range(&a, repo, prefix, prefix)) < 0 ||
+ (error = git_iterator_for_workdir_range(&b, repo, prefix, prefix)) < 0)
goto on_error;
git__free(prefix);
@@ -948,7 +950,7 @@ int git_diff_workdir_to_index(
on_error:
git__free(prefix);
git_iterator_free(a);
- return -1;
+ return error;
}
@@ -959,12 +961,14 @@ int git_diff_workdir_to_tree(
git_diff_list **diff)
{
git_iterator *a = NULL, *b = NULL;
+ int error;
+
char *prefix = opts ? diff_prefix_from_pathspec(&opts->pathspec) : NULL;
assert(repo && old_tree && diff);
- if (git_iterator_for_tree_range(&a, repo, old_tree, prefix, prefix) < 0 ||
- git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0)
+ if ((error = git_iterator_for_tree_range(&a, repo, old_tree, prefix, prefix)) < 0 ||
+ (error = git_iterator_for_workdir_range(&b, repo, prefix, prefix)) < 0)
goto on_error;
git__free(prefix);
@@ -974,7 +978,7 @@ int git_diff_workdir_to_tree(
on_error:
git__free(prefix);
git_iterator_free(a);
- return -1;
+ return error;
}
diff --git a/tests-clar/diff/workdir.c b/tests-clar/diff/workdir.c
index e184c28..3e388ea 100644
--- a/tests-clar/diff/workdir.c
+++ b/tests-clar/diff/workdir.c
@@ -1,5 +1,6 @@
#include "clar_libgit2.h"
#include "diff_helpers.h"
+#include "repository.h"
static git_repository *g_repo = NULL;
@@ -818,3 +819,19 @@ void test_diff_workdir__submodules(void)
git_diff_list_free(diff);
git_tree_free(a);
}
+
+void test_diff_workdir__cannot_diff_against_a_bare_repository(void)
+{
+ git_diff_options opts = {0};
+ git_diff_list *diff = NULL;
+ git_tree *tree;
+
+ g_repo = cl_git_sandbox_init("testrepo.git");
+
+ cl_assert_equal_i(GIT_EBAREREPO, git_diff_workdir_to_index(g_repo, &opts, &diff));
+
+ cl_git_pass(git_repository_head_tree(&tree, g_repo));
+ cl_assert_equal_i(GIT_EBAREREPO, git_diff_workdir_to_tree(g_repo, &opts, tree, &diff));
+
+ git_tree_free(tree);
+}