Skip to content

Commit 97d41f0

Browse files
committed
Use a fresh git repo rather than a deployed branch on the clone of the xxx fork
1 parent 7968b4d commit 97d41f0

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

makeIOC.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ git clone https://github.com/kmpeters/xxx.git -b ${BRANCH_OS} ${PREFIX}
8989

9090
cd ${PREFIX}
9191

92-
echo "Switching to local deployed branch..."
93-
git checkout -b deployed
94-
95-
9692
echo "${INDENT}Changing IOC prefix..."
9793
./${CHANGE_PREFIX} xxx ${PREFIX}
9894

95+
# Remove the changePrefix.pl script
96+
echo "${INDENT}Removing ${CHANGE_PREFIX}..."
97+
rm ${CHANGE_PREFIX}
98+
9999
# Workaround for strange changePrefix.pl behavior on Windows
100100
if [ "${OS}" == "Windows" ]
101101
then
@@ -110,15 +110,16 @@ then
110110
mv iocBoot/ioc${OS} iocBoot/ioc${PREFIX}
111111
fi
112112

113-
# Add renamed directories/files to git
114-
git add iocBoot/ioc${PREFIX}
115-
git add *${PREFIX}*
113+
# Create a fresh git repo
114+
echo "${INDENT}Creating a fresh git repo..."
115+
rm -rf .git/
116+
git init
116117

117-
# Remove the changePrefix.pl script
118-
echo "${INDENT}Removing ${CHANGE_PREFIX}..."
119-
git rm ${CHANGE_PREFIX}
118+
# Add files to git
119+
echo "${INDENT}Adding files..."
120+
git add .
120121

121-
echo "${INDENT}Commiting changes to deployed branch..."
122+
echo "${INDENT}Commiting changes..."
122123
git commit -am "Initial commit of ${PREFIX} after running ${CHANGE_PREFIX}"
123124

124125
cd ..

0 commit comments

Comments
 (0)