diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-04-04 14:21:43 +0000 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-04-04 14:21:43 +0000 |
| commit | a1eca9a94e34407073605614b56d13c3738cbfa9 (patch) | |
| tree | db540104c96baa21744d8607e81b176a3f95d424 /plugins/rsync.lua | |
| parent | 77266b3ec2efec51f0a3246cbad70a4f15835958 (diff) | |
| parent | fd908026c2d12ac83c51fe9ed57c3316230ea105 (diff) | |
| download | gitano-baserock/danielsilverstone/upgrade-gitano-fix-rsync.tar.gz | |
Merge remote-tracking branch 'origin/master' into baserock/danielsilverstone/upgrade-gitano-fix-rsyncbaserock/danielsilverstone/upgrade-gitano-fix-rsync
Update to latest upstream, including some caching of
data and a fix to allow rsync to file paths deeper inside repos.
Diffstat (limited to 'plugins/rsync.lua')
| -rw-r--r-- | plugins/rsync.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/rsync.lua b/plugins/rsync.lua index 310fe59..8f8c8da 100644 --- a/plugins/rsync.lua +++ b/plugins/rsync.lua @@ -39,9 +39,10 @@ local function rsync_detect_repo(config, cmdline) -- Basically, while there's still something to the repopath -- and we've not yet found a repo, strip an element and try again... - while not repo and repopath ~= ""do + while (not repo or repo.is_nascent) and repopath ~= ""do + gitano.log.error("Trying " .. repopath) repo, msg = gitano.repository.find(config, repopath) - if not repo then + if not repo or repo.is_nascent then repopath = repopath:match("^(.*)/[^/]*$") or "" end end |