From 5935a357efd7be14481b21560347f70116891e16 Mon Sep 17 00:00:00 2001
From: "Justin J. Novack" <jnovack@gmail.com>
Date: Sun, 16 Sep 2012 13:52:17 -0400
Subject: ADD: Commit as logged in user

---
 src/phorkie/Repository/Post.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/phorkie/Repository/Post.php')

diff --git a/src/phorkie/Repository/Post.php b/src/phorkie/Repository/Post.php
index de987e0..ed44cf1 100644
--- a/src/phorkie/Repository/Post.php
+++ b/src/phorkie/Repository/Post.php
@@ -15,7 +15,7 @@ class Repository_Post
      *
      * @return boolean True if the post was successful
      */
-    public function process($postData)
+    public function process($postData, $sessionData)
     {
         if (!isset($postData['files'])) {
             return false;
@@ -117,11 +117,17 @@ class Repository_Post
             }
         }
 
+        $commitmsg = "phorkie commit";
+        if (isset($sessionData['identity'])) {
+            $commitmsg .= " from ".$sessionData['identity'];
+        } else {
+            $commitmsg .= " by ".$sessionData['ipaddr'];
+        }
+
         if ($bCommit) {
             $vc->getCommand('commit')
-                ->setOption('message', '')
-                ->setOption('allow-empty-message')
-                ->setOption('author', 'Anonymous <anonymous@phorkie>')
+                ->setOption('message', $commitmsg)
+                ->setOption('author', $sessionData['name'].' <'.$sessionData['email'].'>')
                 ->execute();
             $bChanged = true;
         }
-- 
cgit v1.2.3


From 4293cbe275bec99763c9fd4bd5df347bd359599f Mon Sep 17 00:00:00 2001
From: "Justin J. Novack" <jnovack@gmail.com>
Date: Tue, 18 Sep 2012 08:09:00 -0400
Subject: FIX: Add identity to notes rather than commit

---
 src/phorkie/Repository/Post.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/phorkie/Repository/Post.php')

diff --git a/src/phorkie/Repository/Post.php b/src/phorkie/Repository/Post.php
index ed44cf1..9119e06 100644
--- a/src/phorkie/Repository/Post.php
+++ b/src/phorkie/Repository/Post.php
@@ -118,10 +118,11 @@ class Repository_Post
         }
 
         $commitmsg = "phorkie commit";
+
         if (isset($sessionData['identity'])) {
-            $commitmsg .= " from ".$sessionData['identity'];
+            $notes = $sessionData['identity'];
         } else {
-            $commitmsg .= " by ".$sessionData['ipaddr'];
+            $notes = $sessionData['ipaddr'];
         }
 
         if ($bCommit) {
@@ -129,6 +130,11 @@ class Repository_Post
                 ->setOption('message', $commitmsg)
                 ->setOption('author', $sessionData['name'].' <'.$sessionData['email'].'>')
                 ->execute();
+            //FIXME: git needs ref BEFORE add. ideally VersionControl_Git needs to be updated
+            $vc->getCommand('notes --ref=identity add')
+				->setOption('force')
+                ->setOption('message', "$notes")
+                ->execute();
             $bChanged = true;
         }
 
-- 
cgit v1.2.3