pindo 5.14.0 → 5.14.1
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/pindo/module/task/model/git/git_tag_task.rb +8 -3
- data/lib/pindo/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4fd889646d73c13ab0b424a1c13d6b902a3ceefb0a2fd74e7d435af8ca3d7a62
|
|
4
|
+
data.tar.gz: 2c43d4e6ece3b7d8597c55b34a72c6d9268031194bf6a7de6cc4b59ee59791d1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a935ffba48d488c04b601db1e19cbe77c9f0653c5b9c9bf3ca7f6505a45e1b103f95f96e276d0697c9bbc0dae42344b820eb26a8a6108ee00ea33b45a70ce416
|
|
7
|
+
data.tar.gz: 552010fc0badbe0072bc3262a57b7387e2b1640429cbd1fa3c0f1273d2ac219926f2b0c25b6e0cfc0d940ebf8b76bb4f573a36cd02abc266b9d1447c1a91132b
|
|
@@ -110,11 +110,16 @@ module Pindo
|
|
|
110
110
|
# 5. 还原 stash
|
|
111
111
|
if stash_saved
|
|
112
112
|
begin
|
|
113
|
-
|
|
113
|
+
# 先应用 stash（不删除）
|
|
114
|
+
Pindo::GitHandler.git!(%W(-C #{root_dir} stash apply))
|
|
115
|
+
# 应用成功后再删除 stash
|
|
116
|
+
Pindo::GitHandler.git!(%W(-C #{root_dir} stash drop))
|
|
114
117
|
Funlog.instance.fancyinfo_success("已还原 stash")
|
|
115
118
|
rescue => e
|
|
116
|
-
|
|
117
|
-
|
|
119
|
+
# 如果应用失败（通常是有冲突），stash 仍然保留，用户可以手动处理
|
|
120
|
+
Funlog.instance.fancyinfo_warning("stash 还原时发生冲突: #{e.message}")
|
|
121
|
+
Funlog.instance.fancyinfo_warning("stash 已保留，请手动执行 'git stash pop' 处理冲突")
|
|
122
|
+
# 不抛出异常，任务仍然标记为成功（因为 tag 已经创建成功）
|
|
118
123
|
end
|
|
119
124
|
end
|
|
120
125
|
end
|
data/lib/pindo/version.rb
CHANGED