diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-14 10:59:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-14 15:45:16 -0700 |
| commit | faf0156b278d1a760362cda1d294a88be7608de4 (patch) | |
| tree | 985d302d66411accd3f05f9fbbb977d9372cfed7 /revision.h | |
| parent | 65347030590bcc251a9ff2ed96487a0f1b9e9fa8 (diff) | |
| download | git-faf0156b278d1a760362cda1d294a88be7608de4.tar.gz | |
revision --simplify-merges: use decoration instead of commit->util field
The users of revision walking machinery may want to use the util pointer
for their own use. Use decoration to hold the data needed during merge
simplification instead.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.h b/revision.h index dfa06b5210..765ef6c5e2 100644 --- a/revision.h +++ b/revision.h @@ -110,6 +110,7 @@ struct rev_info { struct reflog_walk_info *reflog_info; struct decoration children; + struct decoration merge_simplification; }; #define REV_TREE_SAME 0 |