30 lines
906 B
Plaintext
30 lines
906 B
Plaintext
|
#!/bin/bash
|
||
|
|
# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
|
||
|
|
source "$(dirname -- "$0")/../load.sh" || exit 1
|
||
|
|
require: git
|
||
|
|
|
||
|
|
eval "$(source "$MYDIR/_rel74.conf"; echo_setv Source="$DEVELOP")"
|
||
|
|
eval "$(source "$MYDIR/_rel82.conf"; echo_setv Dest="$DEVELOP")"
|
||
|
|
|
||
|
|
Remote=
|
||
|
|
args=(
|
||
|
|
"fusionner la branche $Source dans $Dest"
|
||
|
|
-d:,--chdir:BASEDIR chdir= "répertoire dans lequel se placer avant de lancer les opérations"
|
||
|
|
-o:,--remote Remote= "++spécifier le remote vers lequel pousser les branches"
|
||
|
|
)
|
||
|
|
parse_args "$@"; set -- "${args[@]}"
|
||
|
|
|
||
|
|
if [ -n "$chdir" ]; then
|
||
|
|
cd "$chdir" || die
|
||
|
|
fi
|
||
|
|
|
||
|
|
git_check_gitvcs || die "\
|
||
|
|
$(ppath "$(pwd)" ~): ce répertoire n'est pas un dépôt git"
|
||
|
|
git_check_cleancheckout || die "\
|
||
|
|
Impossible de fusionner car il y a des modifications locales.
|
||
|
|
Enregistrer les modifications et réessayez"
|
||
|
|
|
||
|
|
setx branch=git_get_branch
|
||
|
|
|
||
|
|
estep "Merge $Source --> $Dest"
|