Wire up the push_update_reference_callback to fire the PushStatusError callback if the returned status is not NULL and the update was rejected by the remote server.

Author: nemesv

LibGit2Sharp/Core/GitRemoteCallbacks.cs

@@ -27,7 +27,7 @@ internal struct GitRemoteCallbacks
 
         internal NativeMethods.git_push_transfer_progress push_transfer_progress;
 
-        internal IntPtr push_update_reference;
+        internal NativeMethods.push_update_reference_callback push_update_reference;
 
         internal IntPtr payload;
     }

LibGit2Sharp/Core/NativeMethods.cs

@@ -1108,6 +1108,12 @@ internal delegate int remote_update_tips_callback(
             ref GitOid newId,
             IntPtr data);
 
+        internal delegate int push_update_reference_callback(
+            IntPtr refName,
+            IntPtr status,
+            IntPtr data
+            );
+
         [DllImport(libgit2)]
         internal static extern int git_repository_discover(
             GitBuf buf,

LibGit2Sharp/RemoteCallbacks.cs

@@ -27,6 +27,7 @@ internal RemoteCallbacks(PushOptions pushOptions)
             PushTransferProgress = pushOptions.OnPushTransferProgress;
             PackBuilderProgress = pushOptions.OnPackBuilderProgress;
             CredentialsProvider = pushOptions.CredentialsProvider;
+            PushStatusError = pushOptions.OnPushStatusError;
         }
 
         internal RemoteCallbacks(FetchOptionsBase fetchOptions)
@@ -54,6 +55,12 @@ internal RemoteCallbacks(FetchOptionsBase fetchOptions)
         /// </summary>
         private readonly UpdateTipsHandler UpdateTips;
 
+        /// <summary>
+        /// PushStatusError callback. It will be called when the libgit2 push_update_reference returns a non null status message, 
+        /// which means that the update was rejected by the remote server.
+        /// </summary>
+        private readonly PushStatusErrorHandler PushStatusError;
+
         /// <summary>
         /// Managed delegate to be called in response to a git_transfer_progress_callback callback from libgit2.
         /// This will in turn call the user provided delegate.
@@ -91,6 +98,11 @@ internal GitRemoteCallbacks GenerateCallbacks()
                 callbacks.update_tips = GitUpdateTipsHandler;
             }
 
+            if (PushStatusError != null)
+            {
+                callbacks.push_update_reference = GitPushUpdateReference;
+            }
+
             if (CredentialsProvider != null)
             {
                 callbacks.acquire_credentials = GitCredentialHandler;
@@ -164,6 +176,30 @@ private int GitUpdateTipsHandler(IntPtr str, ref GitOid oldId, ref GitOid newId,
             return Proxy.ConvertResultToCancelFlag(shouldContinue);
         }
 
+        /// <summary>
+        /// The delegate with the signature that matches the native push_update_reference function's signature
+        /// </summary>
+        /// <param name="str">IntPtr to string, the name of the reference</param>
+        /// <param name="status">IntPtr to string, the update status message</param>
+        /// <param name="data">IntPtr to optional payload passed back to the callback.</param>
+        /// <returns>0 on success; a negative value to abort the process.</returns>
+        private int GitPushUpdateReference(IntPtr str, IntPtr status, IntPtr data)
+        {
+            PushStatusErrorHandler onPushError = PushStatusError;            
+
+            if (onPushError != null)
+            {
+                string reference = LaxUtf8Marshaler.FromNative(str);
+                string message = LaxUtf8Marshaler.FromNative(status);
+                if (message != null)
+                {
+                    onPushError(new PushStatusError(reference, message));
+                }
+            }
+
+            return Proxy.ConvertResultToCancelFlag(true);
+        }
+
         /// <summary>
         /// The delegate with the signature that matches the native git_transfer_progress_callback function's signature.
         /// </summary>