Add "all parents" view/link to commitdiff, which uses '-m' to show
diff to all parents of a merge commit.
This is instead of having link "combined" to combined (-c) or compact
combined (--cc) diff for a merge commit, till we have syntax
highlighting for combined diff.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
gitweb/gitweb.perl | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 255487d..84b4abb 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3289,7 +3289,7 @@ sub git_commitdiff {
hash=>$hash, hash_parent=>$hash_parent)},
"raw");
- if (defined $hash_parent) {
+ if (defined $hash_parent && substr($hash_parent, 0, 1) ne '-') {
# commitdiff with two commits given
$formats_nav .=
' (' .
@@ -3310,6 +3310,15 @@ sub git_commitdiff {
')';
} else {
# merge commit
+ $formats_nav .= ' | ';
+ if (defined $hash_parent && $hash_parent eq '-m') {
+ $formats_nav .= 'all parents';
+ } else {
+ $formats_nav .=
+ $cgi->a({-href => href(action=>"commitdiff",
+ hash=>$hash, hash_parent=>'-m')},
+ 'all parents');
+ }
$formats_nav .=
' (' .
join(' ', map {
--
1.4.2.1
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
