travis-ci: build with the right compiler

diff --git a/builtin/diff.c b/builtin/diff.c
index 361a3c3ed38769f798b83933755fed84724ce43c..f0393bba23a7d95c67470508a6b63e4e41e8d46b 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -41,7 +41,7 @@ static void stuff_change(struct diff_options *opt,
        struct diff_filespec *one, *two;
 
        if (!is_null_oid(old_oid) && !is_null_oid(new_oid) &&
-           !oidcmp(old_oid, new_oid) && (old_mode == new_mode))
+           oideq(old_oid, new_oid) && (old_mode == new_mode))
                return;
 
        if (opt->flags.reverse_diff) {
@@ -318,7 +318,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        git_config(git_diff_ui_config, NULL);
        precompose_argv(argc, argv);
 
-       init_revisions(&rev, prefix);
+       repo_init_revisions(the_repository, &rev, prefix);
 
        if (no_index && argc != i + 2) {
                if (no_index == DIFF_NO_INDEX_IMPLICIT) {
@@ -339,7 +339,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        }
        if (no_index)
                /* If this is a no-index diff, just run it and exit there. */
-               diff_no_index(&rev, argc, argv);
+               diff_no_index(the_repository, &rev, argc, argv);
 
        /* Otherwise, we are doing the usual "git" diff */
        rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;