Tuesday, June 15, 2010

git: New workflow for CMake

git clone git://cmake.org/cmake.git CMake
cd CMake
git checkout master
git checkout -b finddcmtk
cp ~/Perso/gdcm/trunk/CMake/FindDCMTK.cmake Modules
git add -- Modules/FindDCMTK.cmake
git commit -m"Cleanup FindDCMTK (using foreach). Fix linking on win32 static libs."
git checkout -b next origin/next
git checkout next
git pull
git merge finddcmtk
git config remote.origin.pushurl git@cmake.org:cmake.git
git push

watchout that commit message should be single-lined:

$ git push -v
Pushing to git@cmake.org:cmake.git
Counting objects: 15, done.
Delta compression using up to 16 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 2.19 KiB, done.
Total 8 (delta 5), reused 0 (delta 0)
commit 7cc81454 has an invalid message:
the second line must be empty (if it exists)
commit message is:
Adding simplified version of DCMTK.
Fix linking on win32 static build
error: hook declined to update refs/heads/next
To git@cmake.org:cmake.git
! [remote rejected] next -> next (hook declined)
error: failed to push some refs to 'git@cmake.org:cmake.git'

* http://public.kitware.com/Wiki/Git/Workflow/Topic
* http://www.cmake.org/Wiki/CMake/Git
* http://cmake.org/gitweb?p=cmake.git;a=tree

No comments: