X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4014-format-patch.sh;h=4795872a776e3ccc7cc904b12c0352aae782f502;hb=659db3f673fe199bad6ce9cc625d3a1b098bfbcf;hp=ac2fde773d954969f8c69d41119252493e44a1d4;hpb=8780bd8fd2fb9a85c39de8d7d3105b94c6a9cf40;p=git.git diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index ac2fde773..4795872a7 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -21,15 +21,15 @@ test_expect_success setup ' for i in D E F; do echo "$i"; done >>file && git update-index file && git commit -m "Side change #2" && - git tag C1 && + git tag C2 && for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file && git update-index file && git commit -m "Side change #3" && git checkout master && - git diff-tree -p C1 | git apply --index && - git commit -m "Master accepts moral equivalent of #1" + git diff-tree -p C2 | git apply --index && + git commit -m "Master accepts moral equivalent of #2" '