xmigra 1.6.2 → 1.6.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/xmigra/vcs_support/git.rb +4 -1
- data/lib/xmigra/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7dd656447d3e97ab9d03aa2e54e46bb9a127360d
|
4
|
+
data.tar.gz: 26d2311252254c1cd30ff722a0ace2bd3b30a932
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 756effc61f5a46850c356b7f5d9732cd75781f511950a588766fc035bfa081bdc6ab52b9c85c7941ccb0972652aacfd0c555525b370cd9130de07e6c1bb08840
|
7
|
+
data.tar.gz: f309fab4c6ae9b3f7ce74d3eec5957e34d42b23cbdf5901f1f78f0449bd1466466ebfe2ac975c0d54cd48f315a9d8160cdcf3e4fa28b09e75666368680be29e5
|
@@ -281,7 +281,10 @@ module XMigra
|
|
281
281
|
def vcs_production_contents(path)
|
282
282
|
return nil unless git_master_head(:required => false)
|
283
283
|
git_fetch_master_branch
|
284
|
-
|
284
|
+
# Skip the first two characters after the join to leave off the "./" prefix,
|
285
|
+
# which makes git consider the current directory
|
286
|
+
target_path = [git_internal_path, Pathname(path).relative_path_from(self.path)].join('/')[2..-1]
|
287
|
+
git(:show, [git_master_local_branch, target_path].join(':'), :quiet=>true)
|
285
288
|
rescue VersionControlError
|
286
289
|
return nil
|
287
290
|
end
|
data/lib/xmigra/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: xmigra
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.
|
4
|
+
version: 1.6.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Next IT Corporation
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2016-
|
12
|
+
date: 2016-02-07 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|