File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 4646 git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
4747 git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
4848 git checkout origin/$BASE src/
49- git checkout origin/$BASE -- tests/schema/ ':*.mjs'
49+ # exclude mjs files because we want to sync from the head
50+ # neutralizes non-zero exit code because an empty selection result returns 1
51+ git checkout origin/$BASE -- tests/schema/ ':!*.mjs' || echo ""
5052 git commit -m "Restored src/ and tests/schema/" || echo ""
5153 git push -u origin $SYNC
5254
Original file line number Diff line number Diff line change 4242 git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
4343 git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
4444 git checkout origin/$BASE src/
45- git checkout origin/$BASE -- tests/schema/ ':*.mjs'
45+ # exclude mjs files because we want to sync from the head
46+ # neutralizes non-zero exit code because an empty selection result returns 1
47+ git checkout origin/$BASE -- tests/schema/ ':!*.mjs' || echo ""
4648 git commit -m "Restored src/ and tests/schema/" || echo ""
4749 git push -u origin $SYNC
4850
You can’t perform that action at this time.
0 commit comments