Merge pull request #4611 from erikvanzijst/erik/status_char

diff: Add missing GIT_DELTA_TYPECHANGE -> 'T' mapping.

src/diff_print.c

@@ -130,6 +130,7 @@ char git_diff_status_char(git_delta_t status)
 	case GIT_DELTA_COPIED:     code = 'C'; break;
 	case GIT_DELTA_IGNORED:    code = 'I'; break;
 	case GIT_DELTA_UNTRACKED:  code = '?'; break;
+	case GIT_DELTA_TYPECHANGE: code = 'T'; break;
 	case GIT_DELTA_UNREADABLE: code = 'X'; break;
 	default:                   code = ' '; break;
 	}

tests/checkout/typechange.c

 #include "clar_libgit2.h"
+#include "diff_generate.h"
 #include "git2/checkout.h"
 #include "path.h"
 #include "posix.h"
@@ -307,3 +308,28 @@ void test_checkout_typechange__checkout_with_conflicts(void)
 		git_object_free(obj);
 	}
 }
+
+void test_checkout_typechange__status_char(void)
+{
+	size_t i;
+	git_oid oid;
+	git_commit *commit;
+	git_diff *diff;
+	const git_diff_delta *delta;
+	git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT;
+	char expected[8] = {'M', 'M', 'R', 'T', 'D', 'R', 'A', 'R'};
+
+	git_oid_fromstr(&oid, "9b19edf33a03a0c59cdfc113bfa5c06179bf9b1a");
+	cl_git_pass(git_commit_lookup(&commit, g_repo, &oid));
+	diffopts.flags |= GIT_DIFF_INCLUDE_TYPECHANGE;
+	cl_git_pass(git_diff__commit(&diff, g_repo, commit, &diffopts));
+	cl_git_pass(git_diff_find_similar(diff, NULL));
+
+	for (i = 0; i < git_diff_num_deltas(diff); i++) {
+		delta = git_diff_get_delta(diff, i);
+		cl_assert_equal_i(expected[i], git_diff_status_char(delta->status));
+	}
+
+	git_diff_free(diff);
+	git_commit_free(commit);
+}

tests/diff/stats.c

@@ -254,7 +254,7 @@ void test_diff_stats__rename_nochanges_no_find(void)
 	git_buf_free(&buf);
 }
 
-void test_diff_stats__rename_and_modifiy_no_find(void)
+void test_diff_stats__rename_and_modify_no_find(void)
 {
 	git_buf buf = GIT_BUF_INIT;
 	const char *stat =