diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-14 05:07:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-14 06:56:36 (GMT) |
| commit | ca885a4fe6444bed840295378848904106c87c85 (patch) | |
| tree | 77b671ab9b278745ef39f0286b155db871864afe /unpack-trees.h | |
| parent | f746bae84e4746a861d9ebed29fd9255e5cd929f (diff) | |
| download | git-ca885a4fe6444bed840295378848904106c87c85.zip git-ca885a4fe6444bed840295378848904106c87c85.tar.gz git-ca885a4fe6444bed840295378848904106c87c85.tar.bz2 | |
read-tree() and unpack_trees(): use consistent limit
read-tree -m can read up to MAX_TREES, which was arbitrarily set to 8 since
August 2007 (4 is needed to deal with 2 merge-base case).
However, the updated unpack_trees() code had an advertised limit of 4
(which it enforced). In reality the code was prepared to take only 3
trees and giving 4 caused it to stomp on its stack. Rename the MAX_TREES
constant to MAX_UNPACK_TREES, move it to the unpack-trees.h common header
file, and use it from both places to avoid future confusion.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index e8abbcd..50453ed 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -1,6 +1,8 @@ #ifndef UNPACK_TREES_H #define UNPACK_TREES_H +#define MAX_UNPACK_TREES 8 + struct unpack_trees_options; typedef int (*merge_fn_t)(struct cache_entry **src, |