diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:40 -0700 |
| commit | de04706e3151c6b34bc13513cf164ba37e6e95a7 (patch) | |
| tree | ba29e3f95d87196a2a40c428ca6e8746a1495472 /t | |
| parent | 8c17d5a3c0bb9962dcdd5ef199f201c48ed14798 (diff) | |
| parent | 9b7a61d7dab1635607b1b5be480ac78944cafb45 (diff) | |
| download | git-de04706e3151c6b34bc13513cf164ba37e6e95a7.tar.gz | |
Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'
"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 && |