summaryrefslogtreecommitdiff
path: root/t/t4014-format-patch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-06-25 19:27:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-06-25 19:27:48 (GMT)
commitf33b5bddaf7ac1535c6c37fde168597e252872b3 (patch)
tree6235e08655abd8e92b9e895ba84f1db7473bf3db /t/t4014-format-patch.sh
parent34e849b05a454a2c6487f8fbfa68c39932d22730 (diff)
parent08dc26061f3ff9ee79e6cfda88f0c825b8730e54 (diff)
downloadgit-f33b5bddaf7ac1535c6c37fde168597e252872b3.zip
git-f33b5bddaf7ac1535c6c37fde168597e252872b3.tar.gz
git-f33b5bddaf7ac1535c6c37fde168597e252872b3.tar.bz2
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
Diffstat (limited to 't/t4014-format-patch.sh')
-rwxr-xr-xt/t4014-format-patch.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 575e079..958c2da 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -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