kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2020-06-25 12:27:48 -07:00
parent 34e849b05a 08dc26061f
commit f33b5bddaf
1 changed files with 4 additions and 4 deletions
Show Stats 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" ' test_expect_success "format-patch doesn't consider merge commits" '
git checkout -b slave master && git checkout -b feature master &&
echo "Another line" >>file && echo "Another line" >>file &&
test_tick && test_tick &&
git commit -am "Slave change #1" && git commit -am "Feature branch change #1" &&
echo "Yet another line" >>file && echo "Yet another line" >>file &&
test_tick && test_tick &&
git commit -am "Slave change #2" && git commit -am "Feature branch change #2" &&
git checkout -b merger master && git checkout -b merger master &&
test_tick && test_tick &&
git merge --no-ff slave && git merge --no-ff feature &&
git format-patch -3 --stdout >patch && git format-patch -3 --stdout >patch &&
grep "^From " patch >from && grep "^From " patch >from &&
test_line_count = 3 from test_line_count = 3 from