Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-14 21:59:44 +0400
committerJunio C Hamano <gitster@pobox.com>2008-08-15 02:45:16 +0400
commitfaf0156b278d1a760362cda1d294a88be7608de4 (patch)
tree985d302d66411accd3f05f9fbbb977d9372cfed7 /revision.h
parent65347030590bcc251a9ff2ed96487a0f1b9e9fa8 (diff)
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.h1
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