2016-02-04 5:48 GMT+03:00 <billbar...@apache.org>: > Author: billbarker > Date: Thu Feb 4 02:48:13 2016 > New Revision: 1728404 > > URL: http://svn.apache.org/viewvc?rev=1728404&view=rev > Log: > If somehow the local copy doesn't match we don't care > > Modified: > gump/live/python/gump/core/update/git.py > > Modified: gump/live/python/gump/core/update/git.py > URL: > http://svn.apache.org/viewvc/gump/live/python/gump/core/update/git.py?rev=1728404&r1=1728403&r2=1728404&view=diff > ============================================================================== > --- gump/live/python/gump/core/update/git.py (original) > +++ gump/live/python/gump/core/update/git.py Thu Feb 4 02:48:13 2016 > @@ -66,6 +66,7 @@ class GitUpdater(ScmUpdater): > cmd = Cmd('git', 'update_' + module.getName(), > module.getSourceControlStagingDirectory()) > cmd.addParameter('pull') > + cmd.addParameter('--commit') > maybe_make_quiet(module, cmd) > cmd.addParameter(module.getScm().getRootUrl()) > cmd.addParameter(module.getScm().getBranch())
Is Git able to commit if there is no log message provided? My guess is that it will prepare a message (git fmt-merge-msg) and launch an editor. It may be able to detect that it was launched non-interactively (not sure until we try), but there exists "--no-edit" flag to suppress the editor. I wonder why there were local changes to NOTICE.txt file in commons-lang. There should not have been any. http://vmgump.apache.org/gump/public/commons-lang-trunk/gump_work/update_commons-lang-trunk.html [[[ Command Line git pull --quiet http://git-wip-us.apache.org/repos/asf//commons-lang.git master Output error: Your local changes to the following files would be overwritten by merge: NOTICE.txt Please, commit your changes or stash them before you can merge. Aborting ]]] Personally, I use a script with the following commands to perform a clean pull from upstream (regardless of current state of my working copy and the branch I am working on) git reset --hard git clean -f -d git checkout trunk git pull --rebase The first two commands - revert changes in files tracked by git and - remove untracked files and directories. There also exists --ff-only flag to git pull, but I never tried it. Blindly committing with --commit seems wrong unless there is actually a need to keep local changes. Gump may end with building a different source tree than contained in the original git repository. Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: general-unsubscr...@gump.apache.org For additional commands, e-mail: general-h...@gump.apache.org
