mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/merge-file-exit-code'

Browse Source 
"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.

* jk/merge-file-exit-code:
  merge-file: clamp exit code to maximum 127
This commit is contained in:
Junio C Hamano
2015-10-30 13:07:08 -07:00
parent f60b5dc68c e34f80278e
commit 54bc41416c
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
t/t7600-merge.sh
View File

@ -692,4 +692,37 @@ test_expect_success GPG 'merge --no-edit tag should skip editor' '
test_cmp actual expect
'
test_expect_success 'set up mod-256 conflict scenario' '
# 256 near-identical stanzas...
for i in $(test_seq 1 256); do
for j in 1 2 3 4 5; do
echo $i-$j
done
done >file &&
git add file &&
git commit -m base &&
# one side changes the first line of each to "master"
sed s/-1/-master/ <file >tmp &&
mv tmp file &&
git commit -am master &&
# and the other to "side"; merging the two will
# yield 256 separate conflicts
git checkout -b side HEAD^ &&
sed s/-1/-side/ <file >tmp &&
mv tmp file &&
git commit -am side
'
test_expect_success 'merge detects mod-256 conflicts (recursive)' '
git reset --hard &&
test_must_fail git merge -s recursive master
'
test_expect_success 'merge detects mod-256 conflicts (resolve)' '
git reset --hard &&
test_must_fail git merge -s resolve master
'
test_done