thegarage-gitx 2.5.0.alpha1 → 2.5.0.beta1
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
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b22f64be18547e7394ae28d350dd6d43fe30a499
|
|
4
|
+
data.tar.gz: 8dfeb4c9fc0d4dd65171543a00f2654c2c3a4bbb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0af365e03299c621ac0b6029689d7f0131feb6d783a9f4c42bf53842b49e5b46ea42178240b551d9ac673d794f6cb020bcb1d0823028afe3e4e7bab0a69f333f
|
|
7
|
+
data.tar.gz: b17b3084db551cfd97e2c71704fe82d18295243683ac209aa477bec72b007e8e5055d31ff1188d0c996c863937923bfc53fedbf5692a093ca62ae4f8b3d4f1a5
|
|
@@ -49,7 +49,8 @@ module Thegarage
|
|
|
49
49
|
begin
|
|
50
50
|
run_cmd "git merge #{branch}"
|
|
51
51
|
rescue
|
|
52
|
-
|
|
52
|
+
say "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag"
|
|
53
|
+
exit
|
|
53
54
|
end
|
|
54
55
|
end
|
|
55
56
|
|
|
@@ -69,8 +69,9 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
|
|
|
69
69
|
expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
|
|
70
70
|
expect(cli).to receive(:run_cmd).with("git checkout staging").ordered
|
|
71
71
|
expect(cli).to receive(:run_cmd).with("git merge feature-branch").and_raise('git merge feature-branch failed').ordered
|
|
72
|
+
expect(cli).to receive(:exit).and_raise(SystemExit)
|
|
72
73
|
|
|
73
|
-
expect { cli.integrate }.to raise_error(
|
|
74
|
+
expect { cli.integrate }.to raise_error(SystemExit)
|
|
74
75
|
end
|
|
75
76
|
it 'raises a helpful error' do
|
|
76
77
|
should meet_expectations
|