diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:05 -0700 |
| commit | dd261b1727e4c251e761b45295c00d1cfcf52b8b (patch) | |
| tree | e0bbd6802458ca0c37e35e6477200ad44ef5055c /builtin | |
| parent | Merge branch 'rr/die-on-missing-upstream' (diff) | |
| parent | unpack-trees: free cache_entry array members for merges (diff) | |
| download | tgif-dd261b1727e4c251e761b45295c00d1cfcf52b8b.tar.xz | |
Merge branch 'rs/unpack-trees-plug-leak'
* rs/unpack-trees-plug-leak:
unpack-trees: free cache_entry array members for merges
diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
unpack-trees: create working copy of merge entry in merged_entry
unpack-trees: factor out dup_entry
read-cache: mark cache_entry pointers const
cache: mark cache_entry pointers const
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/read-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 042ac1b84f..0f5d7fe23f 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -66,7 +66,7 @@ static int exclude_per_directory_cb(const struct option *opt, const char *arg, return 0; } -static void debug_stage(const char *label, struct cache_entry *ce, +static void debug_stage(const char *label, const struct cache_entry *ce, struct unpack_trees_options *o) { printf("%s ", label); @@ -80,7 +80,8 @@ static void debug_stage(const char *label, struct cache_entry *ce, sha1_to_hex(ce->sha1)); } -static int debug_merge(struct cache_entry **stages, struct unpack_trees_options *o) +static int debug_merge(const struct cache_entry * const *stages, + struct unpack_trees_options *o) { int i; |