Skip to content

Commit e72f08d

Browse files
committed
Add headers
1 parent 590b3da commit e72f08d

File tree

1 file changed

+23
-1
lines changed

1 file changed

+23
-1
lines changed

src/patch

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,26 @@ for BRANCH in "tatter/scratch" "tatter/patches"; do
117117
done
118118

119119
# Display environment info
120+
echo "************************************"
121+
echo "* CONFIGURATION *"
122+
echo "************************************"
123+
echo ""
120124
echo "Scripts Directory: $SCRIPTS"
121125
echo "Project Directory: $ROOT"
122126
echo "Target Version: $TARGET_VERSION"
123127
echo "Current Version: $SOURCE_VERSION"
124128
echo "Source Package: $PACKAGE"
125129
echo "Base Branch: $BASE"
126130
echo "Selected Items: $ITEMS"
131+
echo ""
127132

128133
# From here on everything is destructive (but reversible) so we want hard stops
129134
set -e
130135

136+
echo "************************************"
137+
echo "* STAGING *"
138+
echo "************************************"
139+
echo ""
131140
# Create a blank branch to work on
132141
git switch --orphan tatter/scratch
133142

@@ -179,12 +188,21 @@ git switch -c tatter/patches "$BASE"
179188
# Restore the original state of vendor/
180189
composer install --no-scripts > /dev/null
181190

191+
echo "************************************"
192+
echo "* MERGING *"
193+
echo "************************************"
194+
echo ""
195+
182196
# Attempt the merge
183197
set +e
184198
git cherry-pick tatter/scratch
185199

186200
if [ $? -eq 0 ]; then
187-
echo "Patch successful! Changes available on branch tatter/patches."
201+
echo "************************************"
202+
echo "* SUCCESS *"
203+
echo "************************************"
204+
echo ""
205+
echo "Patch successful! Updated files are available on branch tatter/patches."
188206
git branch -D tatter/scratch
189207
exit 0
190208
fi
@@ -193,6 +211,10 @@ git status
193211

194212
# Conflict: explain and exit
195213
echo ""
214+
echo "************************************"
215+
echo "* RESOLUTION *"
216+
echo "************************************"
217+
echo ""
196218
echo "Conflicts detected during patch! Follow the git instructions for resolution."
197219
echo "Once resolution is complete your changes will be available on branch tatter/patches"
198220
echo "and you should remove the old working branch at tatter/scratch."

0 commit comments

Comments
 (0)