X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-log.c;h=f4975cf35f7f1555739f7657ee62ed983d18cb84;hb=2c47789d817aaf745a5ce5d5f79619c634cc8566;hp=430d87661e37a4b08963de1ee5c31b8143ebc373;hpb=c636d0e2bcffdbd55c096944561d9ac470da600e;p=git.git diff --git a/builtin-log.c b/builtin-log.c index 430d87661..f4975cf35 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -313,7 +313,7 @@ static int show_object(const unsigned char *sha1, int show_tag_object, static int show_tree_object(const unsigned char *sha1, const char *base, int baselen, - const char *pathname, unsigned mode, int stage) + const char *pathname, unsigned mode, int stage, void *context) { printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : ""); return 0; @@ -366,7 +366,7 @@ int cmd_show(int argc, const char **argv, const char *prefix) name, diff_get_color_opt(&rev.diffopt, DIFF_RESET)); read_tree_recursive((struct tree *)o, "", 0, 0, NULL, - show_tree_object); + show_tree_object, NULL); break; case OBJ_COMMIT: rev.pending.nr = rev.pending.alloc = 0; @@ -1082,7 +1082,7 @@ static int add_pending_commit(const char *arg, struct rev_info *revs, int flags) } static const char cherry_usage[] = -"git-cherry [-v] [] []"; +"git cherry [-v] [] []"; int cmd_cherry(int argc, const char **argv, const char *prefix) { struct rev_info revs;