• Brad King's avatar
    ctest_update: Support Git upstream branch rewrites · c3781efb
    Brad King authored
    Use 'git fetch' followed by 'git reset' to update the source tree.  This
    is better than 'git pull' because it can handle a rewritten upstream
    branch and does not leave local modifications.  After fetch, parse
    FETCH_HEAD to find the merge head that 'git pull' would choose to track
    the upstream branch.  Then reset to the selected head.
    In the normal fast-forward case the behavior remains unchanged.
    However, now local modifications and commits will be erased, and
    upstream rewrites are handled smoothly.  This ensures that the upstream
    branch is tested as expected.
cmCTestGIT.cxx 15 KB