1 parent 9eb8175 commit ebe1af3Copy full SHA for ebe1af3
1 file changed
bin/git-update-parent-branch
@@ -31,19 +31,22 @@ else
31
COMMITS="$(git rev-list "$CURRENT_BRANCH"..."$COMMON_ANCESTOR")"
32
fi
33
34
+# TODO - What if we don't have commits?
35
36
echo "CURRENT BRANCH -> $CURRENT_BRANCH"
37
echo "PARENT BRANCH -> $PARENT_BRANCH"
38
echo "COMMIT LIST -> $COMMITS"
39
echo "----"
40
41
+# TODO - What if a checkout fails?
42
git checkout -b "$CURRENT_BRANCH-temp"
43
git fetch
44
45
git checkout "$PARENT_BRANCH" > /dev/null 2>&1
46
git branch -D "$CURRENT_BRANCH" > /dev/null 2>&1
47
git checkout -b "$CURRENT_BRANCH" > /dev/null 2>&1
48
49
+# TODO - What if a cherry-pick fails?
50
if [ "$COMMIT_MODE" == "single-commit" ]; then
51
52
echo "Cherry Picking -> $COMMITS"
0 commit comments