git-si 0.2.2 → 0.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/git/si/version.rb +1 -1
- data/lib/git/si.rb +5 -3
- 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: 5fa4cb1490e4fa174cd2b63a1b99891d81f9c62a
|
|
4
|
+
data.tar.gz: 411468912a2bb99f923e03eea0c60edb7876e727
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a58ab96d2bcd37856541fed3b6e41b3a21c75690f995d78085507313e16c4b801426a94b8fd458dd3109e1d832e31ee450921d810f408725e22aaf467ac6193f
|
|
7
|
+
data.tar.gz: 2baf357e1ad7f4232daba0c2df746d4daf321c863438b33afea37c42f870519aedfbad676236a600c9b954265f2de3ecb4e0ddec44dd2b7629e84752a5f9dea1
|
data/lib/git/si/version.rb
CHANGED
data/lib/git/si.rb
CHANGED
|
@@ -207,8 +207,10 @@ continue, it's wise to reset the master branch afterward."
|
|
|
207
207
|
filename = $1
|
|
208
208
|
file_in_git = `git ls-files #{filename}`
|
|
209
209
|
raise GitError.new("Failed to list git files. I'm not sure why. Check for any errors above.") unless $?.success?
|
|
210
|
-
|
|
211
|
-
|
|
210
|
+
if not file_in_git.empty?
|
|
211
|
+
files_to_add << filename if file_in_git
|
|
212
|
+
say filename
|
|
213
|
+
end
|
|
212
214
|
end
|
|
213
215
|
end
|
|
214
216
|
end
|
|
@@ -253,7 +255,7 @@ continue, it's wise to reset the master branch afterward."
|
|
|
253
255
|
end
|
|
254
256
|
|
|
255
257
|
# check for existing .gitingore
|
|
256
|
-
gitignore = [".svn", "*.sw?", ".config", "*.err", "*.pid", "*.log", "svn-commit.*"]
|
|
258
|
+
gitignore = [".svn", "*.sw?", ".config", "*.err", "*.pid", "*.log", "svn-commit.*", "*.orig"]
|
|
257
259
|
command = "svn status --ignore-externals "
|
|
258
260
|
svn_status = `#{command}`
|
|
259
261
|
raise SvnError.new("Failed to get the svn status. I'm not sure why. Check for any errors above.") if ! $?.success?
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git-si
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Payton Swick
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2014-01-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|