diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2012-09-19 19:00:35 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2012-09-19 19:00:35 +0200 |
| commit | 1797cbc2b010552b54e9d070820fa9cbc9ce3af9 (patch) | |
| tree | f4ac239f23e5cdccd75e4ec514abedbd582f4333 /src/phorkie/Repository | |
| parent | 63575a005e8e2386abb24e97791e18d61e6350fe (diff) | |
| parent | 149e039741f94f9e22bd2c8d7dcf33158a110e79 (diff) | |
| download | phorkie-1797cbc2b010552b54e9d070820fa9cbc9ce3af9.tar.gz phorkie-1797cbc2b010552b54e9d070820fa9cbc9ce3af9.zip | |
Merge branch 'master' into remotefork
Diffstat (limited to 'src/phorkie/Repository')
| -rw-r--r-- | src/phorkie/Repository/Commit.php | 2 | ||||
| -rw-r--r-- | src/phorkie/Repository/Post.php | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/phorkie/Repository/Commit.php b/src/phorkie/Repository/Commit.php index 05c988b..62f1d40 100644 --- a/src/phorkie/Repository/Commit.php +++ b/src/phorkie/Repository/Commit.php @@ -70,4 +70,4 @@ class Repository_Commit } } -?>
\ No newline at end of file +?> diff --git a/src/phorkie/Repository/Post.php b/src/phorkie/Repository/Post.php index de987e0..9119e06 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,23 @@ class Repository_Post } } + $commitmsg = "phorkie commit"; + + if (isset($sessionData['identity'])) { + $notes = $sessionData['identity']; + } else { + $notes = $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(); + //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; } |
