diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-01-03 14:03:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-03 15:44:07 (GMT) |
| commit | 20b630aae924e35c24ee3d082362c36bee1c97b3 (patch) | |
| tree | f39b2b6d88c949dc69b3c752310d931b0516f871 /t/t4014-format-patch.sh | |
| parent | e216cc48daccf69c6de0c7fbb96c56f99197ca4c (diff) | |
| download | git-20b630aae924e35c24ee3d082362c36bee1c97b3.zip git-20b630aae924e35c24ee3d082362c36bee1c97b3.tar.gz git-20b630aae924e35c24ee3d082362c36bee1c97b3.tar.bz2 | |
format-patch: pick up correct branch name from symbolic ref
find_branch_name() assumes to take refs/heads/<branch>. But we also
have symbolic refs, such as HEAD, that can point to a valid branch in
refs/heads and do not follow refs/heads/<branch> syntax. Remove the
assumption and apply normal ref resolution. After all it would be
confusing if rev machinery resolves a ref in one way and
find_branch_name() another.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4014-format-patch.sh')
| -rwxr-xr-x | t/t4014-format-patch.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 4183f9a..7b536e0 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -912,4 +912,18 @@ test_expect_success 'cover letter using branch description (3)' ' grep hello actual >/dev/null ' +test_expect_success 'cover letter using branch description (4)' ' + git checkout rebuild-1 && + test_config branch.rebuild-1.description hello && + git format-patch --stdout --cover-letter master.. >actual && + grep hello actual >/dev/null +' + +test_expect_success 'cover letter using branch description (5)' ' + git checkout rebuild-1 && + test_config branch.rebuild-1.description hello && + git format-patch --stdout --cover-letter -2 HEAD >actual && + grep hello actual >/dev/null +' + test_done |