Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index c39e50028f256b6850327b90aa1137bd8e35ef1a..890db1174f75172ee6b342e26cbbc58e3e4cd03f 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -57,6 +57,14 @@ test_expect_success "format-patch --ignore-if-in-upstream" '
 
 '
 
+test_expect_success "format-patch --ignore-if-in-upstream handles tags" '
+       git tag -a v1 -m tag side &&
+       git tag -a v2 -m tag master &&
+       git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
+       cnt=$(grep "^From " patch1 | wc -l) &&
+       test $cnt = 2
+'
+
 test_expect_success "format-patch doesn't consider merge commits" '
 
        git checkout -b slave master &&