Hi Daniele, Thanks for the contribution!
Code review looks good -- I like how there is a reset --hard to the previous head_sha and message if the stash pop does not work as expected. I have checkout out the branch, will test it locally, and make any notes of unexpected behavior. Thanks, Matt On Mon, Nov 18, 2013 at 10:39 AM, Robert Maynard <robert.mayn...@kitware.com> wrote: > I am understanding properly that the last paragraph properly, this will fix > the problem that setting GIT_TAG to a named branch doesn't keep the branch > up to date with the remotes version of the branch? > > Overall I really like this change to ExternalProject, and I see it being > more in line with how I would guess GIT_TAG to behave like. > > > On Mon, Nov 18, 2013 at 6:19 AM, Daniele E. Domenichelli > <daniele.domeniche...@gmail.com> wrote: >> >> Hello, >> >> Please review the topic ExternalProject_GitUpdate >> >> ExternalProject handles git remote branches by commit hash. Due to this, >> the git repository ends in detached states, and local commits are >> discarded. >> >> This patch uses "git pull --rebase" for remote branches instead of git >> checkout. If there are local changes, "git stash" is used to save the >> changes and restore them after the pull. If any of these operation >> fails, it tries to restore the original status and exits with a fatal >> error, asking the user to resolve the conflicts manually. >> >> This also makes the behaviour of ExternalProject using git more similar >> to the svn version, and probably more likely to what the user expects by >> setting GIT_TAG to a branch. >> >> >> Cheers, >> Daniele >> -- >> >> Powered by www.kitware.com >> >> Visit other Kitware open-source projects at >> http://www.kitware.com/opensource/opensource.html >> >> Please keep messages on-topic and check the CMake FAQ at: >> http://www.cmake.org/Wiki/CMake_FAQ >> >> Follow this link to subscribe/unsubscribe: >> http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers > > > > -- > > Powered by www.kitware.com > > Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > > Please keep messages on-topic and check the CMake FAQ at: > http://www.cmake.org/Wiki/CMake_FAQ > > Follow this link to subscribe/unsubscribe: > http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
