File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -111,8 +111,10 @@ jobs:
111
111
fi
112
112
113
113
git checkout ${NEXT_COMMIT_HASH}
114
- git submodule update --init -- library/
115
- git submodule status -- library/ > ../submodule-heads
114
+ # Collect submodule commits; note that submodules (intentionally!)
115
+ # aren't initialized, hence lines will be prefixed with "-" (see git
116
+ # submodule --help).
117
+ git submodule status -- library/ | sed 's/^-//' > ../submodule-heads
116
118
/usr/bin/time -v ../splitsh-lite/splitsh-lite --progress --prefix=library --target subtree/library
117
119
git checkout -b subtree/library subtree/library
118
120
@@ -191,7 +193,7 @@ jobs:
191
193
echo "NEW_SUBTREE_HEAD=${NEW_SUBTREE_HEAD}" >> $GITHUB_ENV
192
194
193
195
git submodule foreach 'git fetch'
194
- git submodule foreach 'git fetch; grep $sm_path $toplevel/../submodule-heads | cut -f2 -d" " | xargs git checkout'
196
+ git submodule foreach 'git fetch; grep $sm_path $toplevel/../submodule-heads | cut -f1 -d" " | xargs git checkout'
195
197
git -c user.name=gitbot -c user.email=git@bot \
196
198
commit -m "Update submodules" library/
197
199
You can’t perform that action at this time.
0 commit comments