Commit cc605e73acad8b665c3b89a645eae9de4299774b
2015-06-23T23:52:03
Merge pull request #3222 from git-up/conflicted Fixed GIT_DELTA_CONFLICTED not returned in some cases
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
diff --git a/src/diff.c b/src/diff.c
index cc93f57..12d34a1 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1090,8 +1090,10 @@ static int handle_unmatched_new_item(
/* item contained in ignored directory, so skip over it */
return iterator_advance(&info->nitem, info->new_iter);
- else if (info->new_iter->type != GIT_ITERATOR_TYPE_WORKDIR)
- delta_type = GIT_DELTA_ADDED;
+ else if (info->new_iter->type != GIT_ITERATOR_TYPE_WORKDIR) {
+ if (delta_type != GIT_DELTA_CONFLICTED)
+ delta_type = GIT_DELTA_ADDED;
+ }
else if (nitem->mode == GIT_FILEMODE_COMMIT) {
/* ignore things that are not actual submodules */
diff --git a/tests/diff/index.c b/tests/diff/index.c
index 242fb00..f702568 100644
--- a/tests/diff/index.c
+++ b/tests/diff/index.c
@@ -183,7 +183,7 @@ static void do_conflicted_diff(diff_expects *exp, unsigned long flags)
cl_git_pass(git_repository_index(&index, g_repo));
ancestor.path = ours.path = theirs.path = "staged_changes";
- ancestor.mode = ours.mode = theirs.mode = 0100644;
+ ancestor.mode = ours.mode = theirs.mode = GIT_FILEMODE_BLOB;
git_oid_fromstr(&ancestor.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef");
git_oid_fromstr(&ours.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef");
@@ -239,3 +239,32 @@ void test_diff_index__reports_conflicts_when_reversed(void)
cl_assert_equal_i(2, exp.line_adds);
cl_assert_equal_i(5, exp.line_dels);
}
+
+void test_diff_index__not_in_head_conflicted(void)
+{
+ const char *a_commit = "26a125ee1bf"; /* the current HEAD */
+ git_index_entry theirs = {{0}};
+ git_index *index;
+ git_diff *diff;
+ const git_diff_delta *delta;
+
+ git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit);
+
+ cl_git_pass(git_repository_index(&index, g_repo));
+ cl_git_pass(git_index_read_tree(index, a));
+
+ theirs.path = "file_not_in_head";
+ theirs.mode = GIT_FILEMODE_BLOB;
+ git_oid_fromstr(&theirs.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef");
+ cl_git_pass(git_index_conflict_add(index, NULL, NULL, &theirs));
+
+ cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, index, NULL));
+
+ cl_assert_equal_i(git_diff_num_deltas(diff), 1);
+ delta = git_diff_get_delta(diff, 0);
+ cl_assert_equal_i(delta->status, GIT_DELTA_CONFLICTED);
+
+ git_diff_free(diff);
+ git_index_free(index);
+ git_tree_free(a);
+}