diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-17 04:12:18 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-17 04:12:18 +0400 |
| commit | e75bf76f5462af4185d8260f6feecf24dd24a516 (patch) | |
| tree | f079b41f350ea291f968ad531298053212c15922 /builtin-log.c | |
| parent | 1c7ac06dc612c469d74be6be8164465d65a7829a (diff) | |
| parent | 489e351ea03e78746bad0c0ad4fcf4a63920256d (diff) | |
Merge branch 'rs/archive'
* rs/archive:
archive: remove extra arguments parsing code
archive: unify file attribute handling
archive: centralize archive entry writing
archive: add baselen member to struct archiver_args
add context pointer to read_tree_recursive()
archive: remove args member from struct archiver
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-log.c b/builtin-log.c index 430d87661e..617aa67f2b 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; |