On Mon, Feb 11, 2013 at 06:18:04PM +0100, Michal Nazarewicz wrote:
> On Mon, Feb 11 2013, Jeff King wrote:
> > I have two minor comments, which I'll reply inline with. But even with
> > those comments, I think this would be OK to merge.
>
> I'll send a new patchset tomorrow with.
Based on our discussion, I think it would just need the patch below
squashed into your 4/5 (this handles the "undef" thing, and I also fixed
a few typos in the API documentation):
---
diff --git a/perl/Git.pm b/perl/Git.pm
index 0e6fcf9..35893e6 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1038,7 +1038,7 @@ sub credential_read {
return %credential;
}
-=item credential_read( FILE_HANDLE, CREDENTIAL_HASH )
+=item credential_write( FILE_HANDLE, CREDENTIAL_HASH )
Writes credential key-value pairs from hash referenced by C<CREDENTIAL_HASH>
to C<FILE_HANDLE>. Keys and values cannot contain new-line or NUL byte
@@ -1102,7 +1102,7 @@ sub _credential_run {
=item credential( CREDENTIAL_HASH, CODE )
Executes C<git credential> for a given set of credentials and
-specified operation. In both form C<CREDENTIAL_HASH> needs to be
+specified operation. In both forms C<CREDENTIAL_HASH> needs to be
a reference to a hash which stores credentials. Under certain
conditions the hash can change.
@@ -1126,11 +1126,14 @@ sub _credential_run {
}
In the second form, C<CODE> needs to be a reference to a subroutine.
-The function will execute C<git credential fill> to fill provided
-credential hash, than call C<CODE> with C<CREDENTIAL> as the sole
-argument, and finally depending on C<CODE>'s return value execute
-C<git credential approve> (if return value yields true) or C<git
-credential reject> (otherwise). The return value is the same as what
+The function will execute C<git credential fill> to fill the provided
+credential hash, then call C<CODE> with C<CREDENTIAL> as the sole
+argument. If C<CODE>'s return value is defined, the function will
+execute C<git credential approve> (if return value yields true) or
+C<git credential reject> (if return value is false). If the return
+value is undef, nothing at all is executed; this is useful, for
+example, if the credential could neither be verified nor rejected due
+to an unrelated network error. The return value is the same as what
C<CODE> returned. With this form, the usage might look as follows:
if (Git::credential {
@@ -1152,7 +1155,9 @@ sub credential {
if ('CODE' eq ref $op_or_code) {
_credential_run $credential, 'fill';
my $ret = $op_or_code->($credential);
- _credential_run $credential, $ret ? 'approve' : 'reject';
+ if (defined $ret) {
+ _credential_run $credential, $ret ? 'approve' : 'reject';
+ }
return $ret;
} else {
_credential_run $credential, $op_or_code;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html