diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:16 -0700 |
| commit | 93eba05b4f0b235dd859d9a9ed6ebb1ed49e1d60 (patch) | |
| tree | 8fbac7039f2f44a682f250b42fe65be5d2147190 /t | |
| parent | 351d06df519ee405a1926e0c6ee34d6a1dba6b46 (diff) | |
| parent | 9b7a61d7dab1635607b1b5be480ac78944cafb45 (diff) | |
| download | git-93eba05b4f0b235dd859d9a9ed6ebb1ed49e1d60.tar.gz | |
Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint
"git format-patch --ignore-if-upstream A..B" did not like to be fed
tags as boundary commits.
* jc/do-not-feed-tags-to-clear-commit-marks:
format-patch: do not feed tags to clear_commit_marks()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index c39e50028f..890db1174f 100755 --- 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 && |