@neferbyte/cherry-release-cli 1.0.0 → 1.0.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.
- package/bin/cherry-release.sh +1 -2
- package/package.json +1 -1
package/bin/cherry-release.sh
CHANGED
|
@@ -131,11 +131,10 @@ for branch in "${BRANCHES[@]}"; do
|
|
|
131
131
|
|
|
132
132
|
for hash in "$@"; do
|
|
133
133
|
short=$(git rev-parse --short "$hash")
|
|
134
|
-
if ! git -C "$wt_path" cherry-pick
|
|
134
|
+
if ! git -C "$wt_path" cherry-pick "$hash" &>/dev/null; then
|
|
135
135
|
git -C "$wt_path" cherry-pick --abort 2>/dev/null || true
|
|
136
136
|
fail "Cherry-pick of $short will fail on $branch.\nResolve conflicts before deploying."
|
|
137
137
|
fi
|
|
138
|
-
git -C "$wt_path" reset --hard HEAD --quiet 2>/dev/null
|
|
139
138
|
done
|
|
140
139
|
|
|
141
140
|
git worktree remove --force "$wt_path" 2>/dev/null || true
|