Commit f02ee2ff4262c4ca37a3c68af012a0dcf474e339
- Date: Wed Apr 30 01:12:14 +0000 2008
- Committer: Tim Harper (timcharper@gmail.com)
- Author: Tim Harper (timcharper@gmail.com)
- Commit SHA1: f02ee2ff4262c4ca37a3c68af012a0dcf474e339
- Tree SHA1: 159cdf6e8df45ac4aa274b707a6c7af7a2556efd
restore modules even if there weren't any modules to start with
Commit diff
| | |
| 1 | 1 | module SubmoduleHelper |
| 2 | 2 | module Update |
| 3 | 3 | def with_submodule_stashing(&block) |
| 4 | | modules = git.submodule.all |
| 5 | | if modules.empty? |
| 4 | git.submodule.all.each { |m| m.stash } |
| 5 | begin |
| 6 | 6 | yield |
| 7 | | else |
| 8 | | modules.each { |m| m.stash } |
| 9 | | begin |
| 10 | | yield |
| 11 | | ensure |
| 12 | | git.submodule.all.each { |m| m.restore } |
| 13 | | end |
| 14 | | |
| 15 | | update_submodules_si_hay |
| 7 | ensure |
| 8 | git.submodule.all.each { |m| m.restore } |
| 16 | 9 | end |
| 10 | |
| 11 | update_submodules_si_hay |
| 17 | 12 | end |
| 18 | 13 | |
| 19 | 14 | def update_submodules_si_hay |
| toggle raw diff |
--- a/Support/app/helpers/submodule_helper.rb
+++ b/Support/app/helpers/submodule_helper.rb
@@ -1,19 +1,14 @@
module SubmoduleHelper
module Update
def with_submodule_stashing(&block)
- modules = git.submodule.all
- if modules.empty?
+ git.submodule.all.each { |m| m.stash }
+ begin
yield
- else
- modules.each { |m| m.stash }
- begin
- yield
- ensure
- git.submodule.all.each { |m| m.restore }
- end
-
- update_submodules_si_hay
+ ensure
+ git.submodule.all.each { |m| m.restore }
end
+
+ update_submodules_si_hay
end
def update_submodules_si_hay |
