diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 18:49:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 18:49:39 (GMT) |
| commit | 85785df6d6db50ff37d0ff1878c16ad69a063f6a (patch) | |
| tree | 795c85b0b9254583286d5cb08a43f33e63509e87 /t/t1507-rev-parse-upstream.sh | |
| parent | d9036cd28c9b115fe38e2f629292f2ddf60fb805 (diff) | |
| parent | ad2f7255b3e93dacd0982a946d30f6595dd8a805 (diff) | |
| download | git-85785df6d6db50ff37d0ff1878c16ad69a063f6a.zip git-85785df6d6db50ff37d0ff1878c16ad69a063f6a.tar.gz git-85785df6d6db50ff37d0ff1878c16ad69a063f6a.tar.bz2 | |
Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint
"git show -s" (i.e. show log message only) used to incorrectly emit
an extra blank line after a merge commit.
* mk/show-s-no-extra-blank-line-for-merges:
git-show: fix 'git show -s' to not add extra terminator after merge commit
Diffstat (limited to 't/t1507-rev-parse-upstream.sh')
| -rwxr-xr-x | t/t1507-rev-parse-upstream.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index 178694e..1978947 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -121,7 +121,7 @@ test_expect_success 'merge my-side@{u} records the correct name' ' git branch -D new ;# can fail but is ok git branch -t new my-side@{u} && git merge -s ours new@{u} && - git show -s --pretty=format:%s >actual && + git show -s --pretty=tformat:%s >actual && echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect && test_cmp expect actual ) |