mirror of
https://github.com/git/git.git
synced 2024-12-18 22:33:34 +08:00
Merge branch 'en/sequencer-merge-labels'
The commit labels used to explain each side of conflicted hunks placed by the sequencer machinery have been made more readable by humans. * en/sequencer-merge-labels: sequencer: avoid garbled merge machinery messages due to commit labels
This commit is contained in:
commit
6cceea19eb
@ -355,7 +355,7 @@ static int get_message(struct commit *commit, struct commit_message *out)
|
||||
subject_len = find_commit_subject(out->message, &subject);
|
||||
|
||||
out->subject = xmemdupz(subject, subject_len);
|
||||
out->label = xstrfmt("%s... %s", abbrev, out->subject);
|
||||
out->label = xstrfmt("%s (%s)", abbrev, out->subject);
|
||||
out->parent_label = xstrfmt("parent of %s", out->label);
|
||||
|
||||
return 0;
|
||||
|
@ -256,7 +256,7 @@ test_expect_success 'stop on conflicting pick' '
|
||||
D
|
||||
=======
|
||||
G
|
||||
>>>>>>> $commit... G
|
||||
>>>>>>> $commit (G)
|
||||
EOF
|
||||
git tag new-branch1 &&
|
||||
test_must_fail git rebase -i master &&
|
||||
|
@ -283,12 +283,12 @@ test_expect_success 'failed cherry-pick describes conflict in work tree' '
|
||||
a
|
||||
=======
|
||||
c
|
||||
>>>>>>> objid picked
|
||||
>>>>>>> objid (picked)
|
||||
EOF
|
||||
|
||||
test_must_fail git cherry-pick picked &&
|
||||
|
||||
sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
|
||||
sed "s/[a-f0-9]* (/objid (/" foo >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
@ -298,16 +298,16 @@ test_expect_success 'diff3 -m style' '
|
||||
cat <<-EOF >expected &&
|
||||
<<<<<<< HEAD
|
||||
a
|
||||
||||||| parent of objid picked
|
||||
||||||| parent of objid (picked)
|
||||
b
|
||||
=======
|
||||
c
|
||||
>>>>>>> objid picked
|
||||
>>>>>>> objid (picked)
|
||||
EOF
|
||||
|
||||
test_must_fail git cherry-pick picked &&
|
||||
|
||||
sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
|
||||
sed "s/[a-f0-9]* (/objid (/" foo >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
@ -319,7 +319,7 @@ test_expect_success 'revert also handles conflicts sanely' '
|
||||
a
|
||||
=======
|
||||
b
|
||||
>>>>>>> parent of objid picked
|
||||
>>>>>>> parent of objid (picked)
|
||||
EOF
|
||||
{
|
||||
git checkout picked -- foo &&
|
||||
@ -345,7 +345,7 @@ test_expect_success 'revert also handles conflicts sanely' '
|
||||
test_must_fail git update-index --refresh -q &&
|
||||
test_must_fail git diff-index --exit-code HEAD &&
|
||||
test_cmp expected-stages actual-stages &&
|
||||
sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
|
||||
sed "s/[a-f0-9]* (/objid (/" foo >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
@ -429,16 +429,16 @@ test_expect_success 'revert conflict, diff3 -m style' '
|
||||
cat <<-EOF >expected &&
|
||||
<<<<<<< HEAD
|
||||
a
|
||||
||||||| objid picked
|
||||
||||||| objid (picked)
|
||||
c
|
||||
=======
|
||||
b
|
||||
>>>>>>> parent of objid picked
|
||||
>>>>>>> parent of objid (picked)
|
||||
EOF
|
||||
|
||||
test_must_fail git revert picked &&
|
||||
|
||||
sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
|
||||
sed "s/[a-f0-9]* (/objid (/" foo >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user