Discover Centmin Mod today
Register Now

Beta Branch restore user-friendly cmupdate output in 140.00beta01

Discussion in 'Centmin Mod Github Commits' started by eva2000, May 20, 2026.

  1. eva2000

    eva2000 Administrator Staff Member

    59,481
    12,536
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +19,176
    Local Time:
    1:39 AM
    Nginx 1.31.x
    MariaDB 10.x/11.4+/12.3+
    restore user-friendly cmupdate output in 140.00beta01

    Port of the 141.00beta01 fix. Same regression introduced by 4e67a4e6
    (rebase-aware _cmm_git_sync_impl helper) — running cmupdate on an
    up-to-date checkout prints only bare "From <URL> -> FETCH_HEAD" lines.
    Additionally fixes a stray-backslash grep pattern that triggers
    "grep: warning: stray \ before /" on GNU grep 3.8+.

    Changes:
    - inc/git_sync.inc: emit status messages around fetch/merge:
    - "Checking for updates on origin/<branch> ..." before fetch
    - "Already up to date with origin/<branch> at <short_sha>." on the
    SHA-equal path (previously silent)
    - "Fast-forwarding <branch> to origin/<branch> ..." before merge
    - "Updated to <short_sha> <subject>." after successful FF
    - swap git pull --ff-only origin "$branch" ->
    git merge --ff-only "origin/$branch" to eliminate the duplicate
    "From <URL> -> FETCH_HEAD" line (we already fetched).
    - error string at line 74 updated to match the new command name.
    - tools/cmupdate.sh:
    - remove the bare fupdate call before the case "$1" block so
    every cmupdate invocation runs fupdate once instead of twice.
    Side benefit: cmupdate update-stable / update-beta no longer
    sync the current branch first before switching, and the cmsec
    symlink work in fupdate runs once instead of twice.
    - wrap the _cmm_git_sync call (CHECK_GITCLEAN=no path) with the
    same banner / git branch / git log -1 framing updatecm.sh uses;
    use git log -1 --pretty=tformat:'Latest commit: %h (%ad)%n %s'
    --date=short for a compact two-line summary that fits 80-col
    SSH terminals.
    - fix grep pattern 'HTTP\/' -> 'HTTP/' (the backslash before /
    is meaningless and triggers a grep warning on newer GNU grep).
    - inc/updater_submenu.inc: drop the two stale cecho hint lines that
    printed "git stash" / "git pull" as user instructions in
    gitenv_update. The actual work is done by _cmm_git_sync_impl.

    Continue reading...


    140.00beta01 branch