git.cweiske.de
/
phorkie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
fe8ea32
)
fix ticket #1: error setting name with slashes
author
Christian Weiske
<cweiske@cweiske.de>
Fri, 13 Apr 2012 11:59:06 +0000
(13:59 +0200)
committer
Christian Weiske
<cweiske@cweiske.de>
Fri, 13 Apr 2012 11:59:06 +0000
(13:59 +0200)
src/phorkie/Repository/Post.php
patch
|
blob
|
history
diff --git
a/src/phorkie/Repository/Post.php
b/src/phorkie/Repository/Post.php
index a982c7fd04a6bade3fe217657b3342576b965f3a..471cbd80a707c0a5e620409b3292c0081d65ac85 100644
(file)
--- a/
src/phorkie/Repository/Post.php
+++ b/
src/phorkie/Repository/Post.php
@@
-67,12
+67,17
@@
class Repository_Post
} else if (isset($arFile['delete']) && $arFile['delete'] == 1) {
$bDelete = true;
} else if ($orignalName != $name) {
} else if (isset($arFile['delete']) && $arFile['delete'] == 1) {
$bDelete = true;
} else if ($orignalName != $name) {
- //FIXME: what to do with overwrites?
- $vc->getCommand('mv')
- ->addArgument($orignalName)
- ->addArgument($name)
- ->execute();
- $bChanged = true;
+ if (strpos($name, '/') === false) {
+ //ignore names with a slash in it, would be new directory
+ //FIXME: what to do with overwrites?
+ $vc->getCommand('mv')
+ ->addArgument($orignalName)
+ ->addArgument($name)
+ ->execute();
+ $bChanged = true;
+ } else {
+ $name = $orignalName;
+ }
}
$file = $this->repo->getFileByName($name, false);
}
$file = $this->repo->getFileByName($name, false);