author | Jakub Narebski <jnareb@gmail.com> | |
Fri, 9 Oct 2009 12:26:44 +0000 (14:26 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 9 Oct 2009 21:57:06 +0000 (14:57 -0700) | ||
commit | 1655c98790682aed8892eb8a9eb6d44e00d5f69f | |
tree | da0f54787dcb7c1841ae70bb31fc7cfecd933bd3 | tree | snapshot |
parent | 1be224ba6e99f0ab34c998d7fa8023b76a15c8b6 | commit | diff |
gitweb: Do not show 'patch' link for merge commits
The 'patch' view is about generating text/plain patch that can be
given to "git am", and "git am" doesn't understand merges anyway.
Therefore link to 'patch' view should not be shown for merge commits.
Also call to git-format-patch inside the 'patch' action would fail
when 'patch' action is called for a merge commit, with "Reading
git-format-patch failed" text as 'patch' view body.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The 'patch' view is about generating text/plain patch that can be
given to "git am", and "git am" doesn't understand merges anyway.
Therefore link to 'patch' view should not be shown for merge commits.
Also call to git-format-patch inside the 'patch' action would fail
when 'patch' action is called for a merge commit, with "Reading
git-format-patch failed" text as 'patch' view body.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
gitweb/gitweb.perl | diff | blob | history |