git: a2541386e117 - main - jemalloc: bootstramp vendor/jemalloc branch

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Warner Losh <imp_at_FreeBSD.org>
Date: Sun, 01 Dec 2024 06:54:13 UTC

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=a2541386e117da15a04464eed5226ca3167096ad

commit a2541386e117da15a04464eed5226ca3167096ad
Merge: 5fcaf1329722 d4d6bda0bc79
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-12-01 06:44:57 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-12-01 06:53:43 +0000

    jemalloc: bootstramp vendor/jemalloc branch
    
    Using the just created vendor/jemalloc (details on its creation there),
    create a subtree merge commit to boostrap (thanks emaste for the recipe
    for another bootstrap):
    % git merge -s subtree -Xsubtree=contrib/jemalloc -Xours vendor/jemalloc --allow-unrelated-histories
    
    Now, cleanup the imported sources:
    % cd contrib/jemalloc
    % cat FREEBSD-Xlist | xargs git rm -rf
    % git commit --amend
    % git diff freebsd/main main    # shows only FREEBSD-Xlist cleanups as diffs
    
    No changes intended.
    
    Sponsored by: Netflix