diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:12:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:12:18 -0700 |
| commit | e75bf76f5462af4185d8260f6feecf24dd24a516 (patch) | |
| tree | f079b41f350ea291f968ad531298053212c15922 /builtin-merge-recursive.c | |
| parent | 1c7ac06dc612c469d74be6be8164465d65a7829a (diff) | |
| parent | 489e351ea03e78746bad0c0ad4fcf4a63920256d (diff) | |
| download | git-e75bf76f5462af4185d8260f6feecf24dd24a516.tar.gz git-e75bf76f5462af4185d8260f6feecf24dd24a516.tar.xz | |
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-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 3731853f8..652a2c32b 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -248,7 +248,7 @@ struct tree *write_tree_from_memory(void) static int save_files_dirs(const unsigned char *sha1, const char *base, int baselen, const char *path, - unsigned int mode, int stage) + unsigned int mode, int stage, void *context) { int len = strlen(path); char *newpath = xmalloc(baselen + len + 1); @@ -268,7 +268,7 @@ static int save_files_dirs(const unsigned char *sha1, static int get_files_dirs(struct tree *tree) { int n; - if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs) != 0) + if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, NULL)) return 0; n = current_file_set.nr + current_directory_set.nr; return n; |