Blame Automation/Modules/Vcs/Git/git_updateRepoChanges.sh

Alain Reguera Delgado 8f60cb
#!/bin/bash
Alain Reguera Delgado 8f60cb
#
Alain Reguera Delgado 8f60cb
# git_updateRepoChanges.sh -- This function standardizes the way
Alain Reguera Delgado 8f60cb
# changes are merged into the repository's local working copy.
Alain Reguera Delgado 8f60cb
#
Alain Reguera Delgado 8f60cb
# Copyright (C) 2009-2013 The CentOS Project
Alain Reguera Delgado 8f60cb
#
Alain Reguera Delgado 8f60cb
# This program is free software; you can redistribute it and/or modify
Alain Reguera Delgado 8f60cb
# it under the terms of the GNU General Public License as published by
Alain Reguera Delgado 8f60cb
# the Free Software Foundation; either version 2 of the License, or (at
Alain Reguera Delgado 8f60cb
# your option) any later version.
Alain Reguera Delgado 8f60cb
#
Alain Reguera Delgado 8f60cb
# This program is distributed in the hope that it will be useful, but
Alain Reguera Delgado 8f60cb
# WITHOUT ANY WARRANTY; without even the implied warranty of
Alain Reguera Delgado 8f60cb
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Alain Reguera Delgado 8f60cb
# General Public License for more details.
Alain Reguera Delgado 8f60cb
#
Alain Reguera Delgado 8f60cb
# You should have received a copy of the GNU General Public License
Alain Reguera Delgado 8f60cb
# along with this program; if not, write to the Free Software
Alain Reguera Delgado 8f60cb
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Alain Reguera Delgado 8f60cb
#
Alain Reguera Delgado 8f60cb
# ----------------------------------------------------------------------
Alain Reguera Delgado 8f60cb
# $Id$
Alain Reguera Delgado 8f60cb
# ----------------------------------------------------------------------
Alain Reguera Delgado 8f60cb
Alain Reguera Delgado 8f60cb
function git_updateRepoChanges {
Alain Reguera Delgado 8f60cb
Alain Reguera Delgado 8f60cb
    # Print action message.
Alain Reguera Delgado 8f60cb
    cli_printMessage "`gettext "Bringing changes from the repository into the working copy"`" --as-banner-line
Alain Reguera Delgado 8f60cb
Alain Reguera Delgado 8f60cb
    # Update working copy and retrieve update output.  When we use
Alain Reguera Delgado 8f60cb
    # git, it is not possible to bring changes for specific
Alain Reguera Delgado 8f60cb
    # directories trees but the whole repository tree. So, we need to
Alain Reguera Delgado 8f60cb
    # position the script in the local working copy directory and
Alain Reguera Delgado 8f60cb
    # execute the pull command therein.
Alain Reguera Delgado 8f60cb
    #
Alain Reguera Delgado 8f60cb
    # NOTE: The `${COMMAND} pull' command triggers the error `Unable
Alain Reguera Delgado 8f60cb
    # to determine absolute path of git directory' while fetch and
Alain Reguera Delgado 8f60cb
    # merge equivalents seems to do what we expect without any visible
Alain Reguera Delgado 8f60cb
    # error.
Alain Reguera Delgado 8f60cb
    ${COMMAND} fetch
Alain Reguera Delgado 8f60cb
    ${COMMAND} merge FETCH_HEAD
Alain Reguera Delgado 8f60cb
Alain Reguera Delgado 8f60cb
}