Discover Centmin Mod today
Register Now

Stable Branch fix cmupdate on old git (CentOS 6/7) in 132.00stable

Discussion in 'Centmin Mod Github Commits' started by eva2000, Oct 25, 2026 at 1:12 PM.

  1. eva2000

    eva2000 Administrator Staff Member

    60,106
    12,587
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +19,244
    Local Time:
    5:07 PM
    Nginx 1.31.x
    MariaDB 10.x/11.4+/12.3+
    fix cmupdate on old git (CentOS 6/7) in 132.00stable

    On git older than 1.8.4 (CentOS 6 git 1.7.1, CentOS 7 git 1.8.3),
    `git fetch origin <branch>` only writes FETCH_HEAD, so cmupdate compared
    HEAD with a stale origin/<branch> and kept saying "Already up to date".

    Changes:
    - inc/git_sync.inc: fetch with an explicit
    +refs/heads/<branch>:refs/remotes/origin/<branch> refspec and no --prune
    (on git 1.7.1, --prune deleted every other origin/* tracking ref)
    - inc/git_sync.inc: _cmm_git_is_ancestor() compares git merge-base output
    instead of git merge-base --is-ancestor (git 1.8.0+)
    - tools/cmupdate.sh, updatecm.sh: same fetch in the fallback used when
    inc/git_sync.inc is missing (it reported success on the old commit)
    - tools/cmupdate-fix.sh: same fetch, and stop before git reset --hard when
    git stash save -u fails on a tree with local changes (git < 1.7.7)


    Continue reading...

    132.00stable branch