Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint

gitster · gitster · commit 2819854ec501 · 2008-11-08T16:50:25.000-08:00
* cj/maint-gitpm-fix-maybe-self:
  Git.pm: do not break inheritance
diff --git a/perl/Git.pm b/perl/Git.pm
@@ -1203,8 +1203,7 @@ either version 2, or (at your option) any later version.
 # the method was called upon an instance and (undef, @args) if
 # it was called directly.
 sub _maybe_self {
-	# This breaks inheritance. Oh well.
-	ref $_[0] eq 'Git' ? @_ : (undef, @_);
+	UNIVERSAL::isa($_[0], 'Git') ? @_ : (undef, @_);
 }
 
 # Check if the command id is something reasonable.

Original file line number	Diff line number	Diff line change
`@@ -1203,8 +1203,7 @@ either version 2, or (at your option) any later version.`
`1203`	`1203`	`# the method was called upon an instance and (undef, @args) if`
`1204`	`1204`	`# it was called directly.`
`1205`	`1205`	`sub _maybe_self {`
`1206`		`- # This breaks inheritance. Oh well.`
`1207`		`- ref $_[0] eq 'Git' ? @_ : (undef, @_);`
	`1206`	`+ UNIVERSAL::isa($_[0], 'Git') ? @_ : (undef, @_);`
`1208`	`1207`	`}`
`1209`	`1208`
`1210`	`1209`	`# Check if the command id is something reasonable.`