mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
e228c1736f
Support for grafts predates Git's strbuf, and hence it is understandable that there was a hard-coded line length limit of 1023 characters (which was chosen a bit awkwardly, given that it is *exactly* one byte short of aligning with the 41 bytes occupied by a commit name and the following space or new-line character). While regular commit histories hardly win comprehensibility in general if they merge more than twenty-two branches in one go, it is not Git's business to limit grafts in such a way. In this particular developer's case, the use case that requires substantially longer graft lines to be supported is the visualization of the commits' order implied by their changes: commits are considered to have an implicit relationship iff exchanging them in an interactive rebase would result in merge conflicts. Thusly implied branches tend to be very shallow in general, and the resulting thicket of implied branches is usually very wide; It is actually quite common that *most* of the commits in a topic branch have not even one implied parent, so that a final merge commit has about as many implied parents as there are commits in said branch. [jc: squashed in tests by Jonathan] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
105 lines
2.3 KiB
Bash
Executable file
105 lines
2.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
#
|
|
|
|
test_description='Test git rev-parse with different parent options'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_cmp_rev_output () {
|
|
git rev-parse --verify "$1" >expect &&
|
|
eval "$2" >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit start &&
|
|
test_commit second &&
|
|
git checkout --orphan tmp &&
|
|
test_commit start2 &&
|
|
git checkout master &&
|
|
git merge -m next start2 &&
|
|
test_commit final &&
|
|
|
|
test_seq 40 |
|
|
while read i
|
|
do
|
|
git checkout --orphan "b$i" &&
|
|
test_tick &&
|
|
git commit --allow-empty -m "$i" &&
|
|
commit=$(git rev-parse --verify HEAD) &&
|
|
printf "$commit " >>.git/info/grafts
|
|
done
|
|
'
|
|
|
|
test_expect_success 'start is valid' '
|
|
git rev-parse start | grep "^[0-9a-f]\{40\}$"
|
|
'
|
|
|
|
test_expect_success 'start^0' '
|
|
test_cmp_rev_output tags/start "git rev-parse start^0"
|
|
'
|
|
|
|
test_expect_success 'start^1 not valid' '
|
|
test_must_fail git rev-parse --verify start^1
|
|
'
|
|
|
|
test_expect_success 'second^1 = second^' '
|
|
test_cmp_rev_output second^ "git rev-parse second^1"
|
|
'
|
|
|
|
test_expect_success 'final^1^1^1' '
|
|
test_cmp_rev_output start "git rev-parse final^1^1^1"
|
|
'
|
|
|
|
test_expect_success 'final^1^1^1 = final^^^' '
|
|
test_cmp_rev_output final^^^ "git rev-parse final^1^1^1"
|
|
'
|
|
|
|
test_expect_success 'final^1^2' '
|
|
test_cmp_rev_output start2 "git rev-parse final^1^2"
|
|
'
|
|
|
|
test_expect_success 'final^1^2 != final^1^1' '
|
|
test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)
|
|
'
|
|
|
|
test_expect_success 'final^1^3 not valid' '
|
|
test_must_fail git rev-parse --verify final^1^3
|
|
'
|
|
|
|
test_expect_success '--verify start2^1' '
|
|
test_must_fail git rev-parse --verify start2^1
|
|
'
|
|
|
|
test_expect_success '--verify start2^0' '
|
|
git rev-parse --verify start2^0
|
|
'
|
|
|
|
test_expect_success 'final^1^@ = final^1^1 final^1^2' '
|
|
git rev-parse final^1^1 final^1^2 >expect &&
|
|
git rev-parse final^1^@ >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
|
|
git rev-parse final^1 ^final^1^1 ^final^1^2 >expect &&
|
|
git rev-parse final^1^! >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'large graft octopus' '
|
|
test_cmp_rev_output b31 "git rev-parse --verify b1^30"
|
|
'
|
|
|
|
test_expect_success 'repack for next test' '
|
|
git repack -a -d
|
|
'
|
|
|
|
test_expect_success 'short SHA-1 works' '
|
|
start=$(git rev-parse --verify start) &&
|
|
test_cmp_rev_output start "git rev-parse ${start%?}"
|
|
'
|
|
|
|
test_done
|