Skip to content

Conversation

@briangough
Copy link

@briangough briangough commented Jul 24, 2025

I needed a stable hash for the v2.0.2 changes for the Server Pro release.
I created this by merging the upstream v2.0.2 into our fork.
I added @Seinzu's commit f3d6794 to fix the lint errors.
Looking at the git log the commits are in the right order.

$ git remote add upstream git@github.com/expressjs/multer.git
$ git fetch upstream
remote: Enumerating objects: 255, done.
remote: Counting objects: 100% (123/123), done.
remote: Compressing objects: 100% (29/29), done.
remote: Total 255 (delta 105), reused 100 (delta 94), pack-reused 132 (from 3)
Receiving objects: 100% (255/255), 85.64 KiB | 851.00 KiB/s, done.
Resolving deltas: 100% (149/149), completed with 36 local objects.
From github.com:expressjs/multer
...
 * [new tag]         v2.0.2          -> v2.0.2
...
$ git switch -c bg-upstream-2-0-2
branch 'bg-upstream-2-0-2' set up to track 'master'.
Switched to a new branch 'bg-upstream-2-0-2'

$ git merge v2.0.2
Auto-merging lib/make-middleware.js
Merge made by the 'ort' strategy.
 CHANGELOG.md                |  5 +++++
 lib/make-middleware.js      | 15 ++++++++++-----
 package.json                |  2 +-
 test/express-integration.js | 42 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 6 deletions(-)

$ git format-patch -1 f3d67942abd11454e63c71103743b840141297a2 
0001-Fix-lint-in-filename-tests.patch

$ git am 0001-Fix-lint-in-filename-tests.patch
Applying: Fix lint in filename tests

$ git push origin
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 12 threads
Compressing objects: 100% (1/1), done.
Writing objects: 100% (5/5), 1.87 KiB | 1.87 MiB/s, done.
Total 5 (delta 4), reused 4 (delta 4), pack-reused 0
remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
remote: 
remote: Create a pull request for 'bg-upstream-2-0-2' on GitHub by visiting:
remote:      https://github.com/overleaf/multer/pull/new/bg-upstream-2-0-2
remote: 
To github.com:overleaf/multer.git
 * [new branch]      bg-upstream-2-0-2 -> bg-upstream-2-0-2

@briangough
Copy link
Author

Closing this PR as we moved away from our fork of multer to using a patch file.

@briangough briangough closed this Jul 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants