2013-05-16 15:32:29 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# ,---E--. *H----------. * marks !TREESAME parent paths
|
|
|
|
|
# / \ / \*
|
|
|
|
|
# *A--*B---D--*F-*G---------K-*L-*M
|
|
|
|
|
# \ /* \ /
|
|
|
|
|
# `-C-' `-*I-*J
|
|
|
|
|
#
|
|
|
|
|
# A creates "file", B and F change it.
|
|
|
|
|
# Odd merge G takes the old version from B.
|
|
|
|
|
# I changes it, but J reverts it, so K is TREESAME to both parents.
|
|
|
|
|
# H and L both change "file", and M merges those changes.
|
|
|
|
|
|
|
|
|
|
test_description='TREESAME and limiting'
|
|
|
|
|
|
2020-11-18 23:44:36 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
|
2013-05-16 15:32:29 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
note () {
|
|
|
|
|
git tag "$1"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unnote () {
|
2022-01-05 23:29:31 +00:00
|
|
|
git name-rev --tags --annotate-stdin | \
|
|
|
|
|
sed -e "s|$OID_REGEX (tags/\([^)]*\))\([ ]\)|\1\2|g"
|
2013-05-16 15:32:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
test_commit "Initial file" file "Hi there" A &&
|
|
|
|
|
git branch other-branch &&
|
|
|
|
|
|
|
|
|
|
test_commit "file=Hello" file "Hello" B &&
|
|
|
|
|
git branch third-branch &&
|
|
|
|
|
|
|
|
|
|
git checkout other-branch &&
|
|
|
|
|
test_commit "Added other" other "Hello" C &&
|
|
|
|
|
|
2020-11-18 23:44:36 +00:00
|
|
|
git checkout main &&
|
2013-05-16 15:32:29 +00:00
|
|
|
test_merge D other-branch &&
|
|
|
|
|
|
|
|
|
|
git checkout third-branch &&
|
|
|
|
|
test_commit "Third file" third "Nothing" E &&
|
|
|
|
|
|
2020-11-18 23:44:36 +00:00
|
|
|
git checkout main &&
|
2013-05-16 15:32:29 +00:00
|
|
|
test_commit "file=Blah" file "Blah" F &&
|
|
|
|
|
|
|
|
|
|
test_tick && git merge --no-commit third-branch &&
|
|
|
|
|
git checkout third-branch file &&
|
|
|
|
|
git commit &&
|
|
|
|
|
note G &&
|
|
|
|
|
git branch fiddler-branch &&
|
|
|
|
|
|
|
|
|
|
git checkout -b part2-branch &&
|
|
|
|
|
test_commit "file=Part 2" file "Part 2" H &&
|
|
|
|
|
|
|
|
|
|
git checkout fiddler-branch &&
|
|
|
|
|
test_commit "Bad commit" file "Silly" I &&
|
|
|
|
|
|
|
|
|
|
test_tick && git revert I && note J &&
|
|
|
|
|
|
2020-11-18 23:44:36 +00:00
|
|
|
git checkout main &&
|
2013-05-16 15:32:29 +00:00
|
|
|
test_tick && git merge --no-ff fiddler-branch &&
|
2015-03-20 10:07:15 +00:00
|
|
|
note K &&
|
2013-05-16 15:32:29 +00:00
|
|
|
|
|
|
|
|
test_commit "file=Part 1" file "Part 1" L &&
|
|
|
|
|
|
|
|
|
|
test_tick && test_must_fail git merge part2-branch &&
|
|
|
|
|
test_commit M file "Parts 1+2"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
check_outcome () {
|
|
|
|
|
outcome=$1
|
|
|
|
|
shift
|
2013-05-16 15:32:30 +00:00
|
|
|
|
|
|
|
|
case "$1" in
|
|
|
|
|
*"("*)
|
|
|
|
|
FMT="%P %H | %s"
|
|
|
|
|
munge_actual="
|
|
|
|
|
s/^\([^ ]*\) \([^ ]*\) .*/(\1)\2/
|
|
|
|
|
s/ //g
|
|
|
|
|
s/()//
|
|
|
|
|
"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
FMT="%H | %s"
|
|
|
|
|
munge_actual="s/^\([^ ]*\) .*/\1/"
|
|
|
|
|
;;
|
|
|
|
|
esac &&
|
|
|
|
|
printf "%s\n" $1 >expect &&
|
|
|
|
|
shift
|
|
|
|
|
|
2013-05-16 15:32:29 +00:00
|
|
|
param="$*" &&
|
|
|
|
|
test_expect_$outcome "log $param" '
|
|
|
|
|
git log --format="$FMT" $param |
|
|
|
|
|
unnote >actual &&
|
2013-05-16 15:32:30 +00:00
|
|
|
sed -e "$munge_actual" <actual >check &&
|
2015-03-20 10:07:52 +00:00
|
|
|
test_cmp expect check
|
2013-05-16 15:32:29 +00:00
|
|
|
'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_result () {
|
|
|
|
|
check_outcome success "$@"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Odd merge G drops a change in F. Important that G is listed in all
|
|
|
|
|
# except the most basic list. Achieving this means normal merge D will also be
|
|
|
|
|
# shown in normal full-history, as we can't distinguish unless we do a
|
|
|
|
|
# simplification pass. After simplification, D is dropped but G remains.
|
2013-05-16 15:32:31 +00:00
|
|
|
# Also, merge simplification of G should not drop the parent B that the default
|
|
|
|
|
# simple history follows.
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'M L K J I H G F E D C B A'
|
2013-05-16 15:32:30 +00:00
|
|
|
check_result '(LH)M (K)L (GJ)K (I)J (G)I (G)H (FE)G (D)F (B)E (BC)D (A)C (A)B A'
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'M H L K J I G E F D C B A' --topo-order
|
|
|
|
|
check_result 'M L H B A' -- file
|
2013-05-16 15:32:31 +00:00
|
|
|
check_result '(LH)M (B)L (B)H (A)B A' --parents -- file
|
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>
2013-05-16 15:32:34 +00:00
|
|
|
check_result 'M L J I H G F D B A' --full-history -- file
|
2013-05-16 15:32:31 +00:00
|
|
|
check_result '(LH)M (K)L (GJ)K (I)J (G)I (G)H (FB)G (D)F (BA)D (A)B A' --full-history --parents -- file
|
2013-05-16 15:32:36 +00:00
|
|
|
check_result '(LH)M (G)H (J)L (I)J (G)I (FB)G (B)F (A)B A' --simplify-merges -- file
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'M L K G F D B A' --first-parent
|
|
|
|
|
check_result 'M L G F B A' --first-parent -- file
|
|
|
|
|
|
|
|
|
|
# Check that odd merge G remains shown when F is the bottom.
|
|
|
|
|
check_result 'M L K J I H G E' F..M
|
|
|
|
|
check_result 'M H L K J I G E' F..M --topo-order
|
|
|
|
|
check_result 'M L H' F..M -- file
|
2013-05-16 15:32:31 +00:00
|
|
|
check_result '(LH)M (B)L (B)H' --parents F..M -- file
|
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>
2013-05-16 15:32:34 +00:00
|
|
|
check_result 'M L J I H G' F..M --full-history -- file
|
2013-05-16 15:32:31 +00:00
|
|
|
check_result '(LH)M (K)L (GJ)K (I)J (G)I (G)H (FB)G' F..M --full-history --parents -- file
|
2013-05-16 15:32:36 +00:00
|
|
|
check_result '(LH)M (G)H (J)L (I)J (G)I (FB)G' F..M --simplify-merges -- file
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'M L K J I H G' F..M --ancestry-path
|
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>
2013-05-16 15:32:34 +00:00
|
|
|
check_result 'M L J I H G' F..M --ancestry-path -- file
|
2013-05-16 15:32:31 +00:00
|
|
|
check_result '(LH)M (K)L (GJ)K (I)J (G)I (G)H (FE)G' F..M --ancestry-path --parents -- file
|
|
|
|
|
check_result '(LH)M (G)H (J)L (I)J (G)I (FE)G' F..M --ancestry-path --simplify-merges -- file
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'M L K G' F..M --first-parent
|
|
|
|
|
check_result 'M L G' F..M --first-parent -- file
|
|
|
|
|
|
|
|
|
|
# Note that G is pruned when E is the bottom, even if it's the same commit list
|
|
|
|
|
# If we want history since E, then we're quite happy to ignore G that took E.
|
|
|
|
|
check_result 'M L K J I H G' E..M --ancestry-path
|
2013-05-16 15:32:39 +00:00
|
|
|
check_result 'M L J I H' E..M --ancestry-path -- file
|
2013-05-16 15:32:40 +00:00
|
|
|
check_result '(LH)M (K)L (EJ)K (I)J (E)I (E)H' E..M --ancestry-path --parents -- file
|
2013-05-16 15:32:39 +00:00
|
|
|
check_result '(LH)M (E)H (J)L (I)J (E)I' E..M --ancestry-path --simplify-merges -- file
|
2013-05-16 15:32:29 +00:00
|
|
|
|
|
|
|
|
# Should still be able to ignore I-J branch in simple log, despite limiting
|
|
|
|
|
# to G.
|
|
|
|
|
check_result 'M L K J I H' G..M
|
|
|
|
|
check_result 'M H L K J I' G..M --topo-order
|
2013-05-16 15:32:41 +00:00
|
|
|
check_result 'M L H' G..M -- file
|
|
|
|
|
check_result '(LH)M (G)L (G)H' G..M --parents -- file
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'M L J I H' G..M --full-history -- file
|
|
|
|
|
check_result 'M L K J I H' G..M --full-history --parents -- file
|
|
|
|
|
check_result 'M H L J I' G..M --simplify-merges -- file
|
|
|
|
|
check_result 'M L K J I H' G..M --ancestry-path
|
|
|
|
|
check_result 'M L J I H' G..M --ancestry-path -- file
|
|
|
|
|
check_result 'M L K J I H' G..M --ancestry-path --parents -- file
|
|
|
|
|
check_result 'M H L J I' G..M --ancestry-path --simplify-merges -- file
|
|
|
|
|
|
|
|
|
|
# B..F should be able to simplify the merge D from irrelevant side branch C.
|
|
|
|
|
# Default log should also be free to follow B-D, and ignore C.
|
|
|
|
|
# But --full-history shouldn't drop D on its own - without simplification,
|
|
|
|
|
# we can't decide if the merge from INTERESTING commit C was sensible.
|
|
|
|
|
check_result 'F D C' B..F
|
2013-05-16 15:32:41 +00:00
|
|
|
check_result 'F' B..F -- file
|
|
|
|
|
check_result '(B)F' B..F --parents -- file
|
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>
2013-05-16 15:32:34 +00:00
|
|
|
check_result 'F D' B..F --full-history -- file
|
2013-05-16 15:32:31 +00:00
|
|
|
check_result '(D)F (BA)D' B..F --full-history --parents -- file
|
|
|
|
|
check_result '(B)F' B..F --simplify-merges -- file
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'F D' B..F --ancestry-path
|
2013-05-16 15:32:39 +00:00
|
|
|
check_result 'F' B..F --ancestry-path -- file
|
2013-05-16 15:32:40 +00:00
|
|
|
check_result 'F' B..F --ancestry-path --parents -- file
|
2013-05-16 15:32:39 +00:00
|
|
|
check_result 'F' B..F --ancestry-path --simplify-merges -- file
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'F D' B..F --first-parent
|
|
|
|
|
check_result 'F' B..F --first-parent -- file
|
|
|
|
|
|
|
|
|
|
# E...F should be equivalent to E F ^B, and be able to drop D as above.
|
2013-05-16 15:32:41 +00:00
|
|
|
check_result 'F' E F ^B -- file # includes D
|
|
|
|
|
check_result 'F' E...F -- file # includes D
|
2013-05-16 15:32:29 +00:00
|
|
|
|
|
|
|
|
# Any sort of full history of C..F should show D, as it's the connection to C,
|
|
|
|
|
# and it differs from it.
|
|
|
|
|
check_result 'F D B' C..F
|
|
|
|
|
check_result 'F B' C..F -- file
|
2013-05-16 15:32:31 +00:00
|
|
|
check_result '(B)F (A)B' C..F --parents -- file
|
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>
2013-05-16 15:32:34 +00:00
|
|
|
check_result 'F D B' C..F --full-history -- file
|
2013-05-16 15:32:31 +00:00
|
|
|
check_result '(D)F (BC)D (A)B' C..F --full-history --parents -- file
|
|
|
|
|
check_result '(D)F (BC)D (A)B' C..F --simplify-merges -- file
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'F D' C..F --ancestry-path
|
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>
2013-05-16 15:32:34 +00:00
|
|
|
check_result 'F D' C..F --ancestry-path -- file
|
2013-05-16 15:32:29 +00:00
|
|
|
check_result 'F D' C..F --ancestry-path --parents -- file
|
|
|
|
|
check_result 'F D' C..F --ancestry-path --simplify-merges -- file
|
|
|
|
|
check_result 'F D B' C..F --first-parent
|
|
|
|
|
check_result 'F B' C..F --first-parent -- file
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
test_done
|