summaryrefslogtreecommitdiff
path: root/t/t6012-rev-list-simplify.sh
diff options
context:
space:
mode:
authorKevin Bracey <kevin@bracey.fi>2013-05-16 15:32:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-05-16 18:51:09 (GMT)
commitd0af663e42abfcd5be6f7c3db21a29e521aa4ca2 (patch)
treed2cbab1eef31e5dc5f1e45d0c3d0088fb2f2eebd /t/t6012-rev-list-simplify.sh
parente32db66d7a6b2ba1569ef5e316d869c40a8fac3b (diff)
downloadgit-d0af663e42abfcd5be6f7c3db21a29e521aa4ca2.zip
git-d0af663e42abfcd5be6f7c3db21a29e521aa4ca2.tar.gz
git-d0af663e42abfcd5be6f7c3db21a29e521aa4ca2.tar.bz2
revision.c: Make --full-history consider more merges
History simplification previously always treated merges as TREESAME if they were TREESAME to any parent. While this was consistent with the default behaviour, this could be extremely unhelpful when searching detailed history, and could not be overridden. For example, if a merge had ignored a change, as if by "-s ours", then: git log -m -p --full-history -Schange file would successfully locate "change"'s addition but would not locate the merge that resolved against it. Futher, simplify_merges could drop the actual parent that a commit was TREESAME to, leaving it as a normal commit marked TREESAME that isn't actually TREESAME to its remaining parent. Now redefine a commit's TREESAME flag to be true only if a commit is TREESAME to _all_ of its parents. This doesn't affect either the default simplify_history behaviour (because partially TREESAME merges are turned into normal commits), or full-history with parent rewriting (because all merges are output). But it does affect other modes. The clearest difference is that --full-history will show more merges - sufficient to ensure that -m -p --full-history log searches can really explain every change to the file, including those changes' ultimate fate in merges. Also modify simplify_merges to recalculate TREESAME after removing a parent. This is achieved by storing per-parent TREESAME flags on the initial scan, so the combined flag can be easily recomputed. This fixes some t6111 failures, but creates a couple of new ones - we are now showing some merges that don't need to be shown. Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6012-rev-list-simplify.sh')
0 files changed, 0 insertions, 0 deletions