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

Merge branch 'pb/t4014-unslave' into jch

Browse Source 
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:
Junio C Hamano
2020-06-19 14:52:25 -07:00
parent 70772f962d 08dc26061f
commit 601a1d1565
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t4014-format-patch.sh
View File

@ -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