Skip to content

Commit ebe1af3

Browse files
committed
Reminders for common errors management
1 parent 9eb8175 commit ebe1af3

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

bin/git-update-parent-branch

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,22 @@ else
3131
COMMITS="$(git rev-list "$CURRENT_BRANCH"..."$COMMON_ANCESTOR")"
3232
fi
3333
fi
34+
# TODO - What if we don't have commits?
3435

3536
echo "CURRENT BRANCH -> $CURRENT_BRANCH"
3637
echo "PARENT BRANCH -> $PARENT_BRANCH"
3738
echo "COMMIT LIST -> $COMMITS"
3839
echo "----"
3940

41+
# TODO - What if a checkout fails?
4042
git checkout -b "$CURRENT_BRANCH-temp"
4143
git fetch
4244

4345
git checkout "$PARENT_BRANCH" > /dev/null 2>&1
4446
git branch -D "$CURRENT_BRANCH" > /dev/null 2>&1
4547
git checkout -b "$CURRENT_BRANCH" > /dev/null 2>&1
4648

49+
# TODO - What if a cherry-pick fails?
4750
if [ "$COMMIT_MODE" == "single-commit" ]; then
4851
echo "----"
4952
echo "Cherry Picking -> $COMMITS"

0 commit comments

Comments
 (0)