Merge branch 'pb/t4014-unslave'
A branch name used in a test has been clarified to match what is going on. * pb/t4014-unslave: t4014: do not use "slave branch" nomenclature
This commit is contained in:
commit
f33b5bddaf
@ -81,16 +81,16 @@ test_expect_success 'format-patch --ignore-if-in-upstream handles tags' '
|
||||
'
|
||||
|
||||
test_expect_success "format-patch doesn't consider merge commits" '
|
||||
git checkout -b slave master &&
|
||||
git checkout -b feature master &&
|
||||
echo "Another line" >>file &&
|
||||
test_tick &&
|
||||
git commit -am "Slave change #1" &&
|
||||
git commit -am "Feature branch change #1" &&
|
||||
echo "Yet another line" >>file &&
|
||||
test_tick &&
|
||||
git commit -am "Slave change #2" &&
|
||||
git commit -am "Feature branch change #2" &&
|
||||
git checkout -b merger master &&
|
||||
test_tick &&
|
||||
git merge --no-ff slave &&
|
||||
git merge --no-ff feature &&
|
||||
git format-patch -3 --stdout >patch &&
|
||||
grep "^From " patch >from &&
|
||||
test_line_count = 3 from
|
||||
|
Loading…
Reference in New Issue
Block a user