summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-14 08:45:59 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-14 08:45:59 -0700
commitb27a79d16b21be064c0ac3634928a91e3eee5c01 (patch)
treee9f75de0da78552765dc5fae1451402e78c36797 /revision.h
parent91d34bc47ba6ed51a35fa3bb84d674b624d3f447 (diff)
parent141efdba57b1769fc60ff9a3925afbc6af398faf (diff)
downloadgit-b27a79d16b21be064c0ac3634928a91e3eee5c01.tar.gz
Merge branch 'kb/full-history-compute-treesame-carefully-2'
Major update to the revision traversal logic to improve culling of irrelevant parents while traversing a mergy history. * kb/full-history-compute-treesame-carefully-2: revision.c: make default history consider bottom commits revision.c: don't show all merges for --parents revision.c: discount side branches when computing TREESAME revision.c: add BOTTOM flag for commits simplify-merges: drop merge from irrelevant side branch simplify-merges: never remove all TREESAME parents t6012: update test for tweaked full-history traversal revision.c: Make --full-history consider more merges Documentation: avoid "uninteresting" rev-list-options.txt: correct TREESAME for P t6111: add parents to tests t6111: allow checking the parents as well t6111: new TREESAME test set t6019: test file dropped in -s ours merge decorate.c: compact table when growing
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/revision.h b/revision.h
index a313a13405..24547b59f1 100644
--- a/revision.h
+++ b/revision.h
@@ -15,7 +15,8 @@
#define ADDED (1u<<7) /* Parents already parsed and added? */
#define SYMMETRIC_LEFT (1u<<8)
#define PATCHSAME (1u<<9)
-#define ALL_REV_FLAGS ((1u<<10)-1)
+#define BOTTOM (1u<<10)
+#define ALL_REV_FLAGS ((1u<<11)-1)
#define DECORATE_SHORT_REFS 1
#define DECORATE_FULL_REFS 2
@@ -169,6 +170,7 @@ struct rev_info {
struct reflog_walk_info *reflog_info;
struct decoration children;
struct decoration merge_simplification;
+ struct decoration treesame;
/* notes-specific options: which refs to show */
struct display_notes_opt notes_opt;