Merge branch 'maint'

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index 846af7bd20274fba2801fbafe50dc12b7252aecc..e75079a6e1316c74b4dff702170134dc7559898f 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -260,7 +260,7 @@ static int tree_difference = REV_TREE_SAME;
 static void file_add_remove(struct diff_options *options,
                    int addremove, unsigned mode,
                    const unsigned char *sha1,
-                   const char *base, const char *path)
+                   const char *fullpath)
 {
        int diff = REV_TREE_DIFFERENT;
 
@@ -286,7 +286,7 @@ static void file_change(struct diff_options *options,
                 unsigned old_mode, unsigned new_mode,
                 const unsigned char *old_sha1,
                 const unsigned char *new_sha1,
-                const char *base, const char *path)
+                const char *fullpath)
 {
        tree_difference = REV_TREE_DIFFERENT;
        DIFF_OPT_SET(options, HAS_CHANGES);
@@ -1002,7 +1002,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
            !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk"))
        {
                unkv[(*unkc)++] = arg;
-               return 0;
+               return 1;
        }
 
        if (!prefixcmp(arg, "--max-count=")) {