modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fast-forwarder si possible

This commit is contained in:
Jephte CLAIN 2015-03-28 01:30:47 +04:00
parent f64117c176
commit ffa91952c2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pdev
View File

@ -129,6 +129,7 @@ if [ "$action" == branch ]; then
# Créer/basculer vers une feature branch # Créer/basculer vers une feature branch
git_ensure_cleancheckout git_ensure_cleancheckout
is_any_branch "$feature" develop feature || die "$release: ce n'est pas une feature branch"
r=0 r=0
if git_have_branch "$feature"; then if git_have_branch "$feature"; then
git checkout "$feature" || r=$? git checkout "$feature" || r=$?

5
prel
View File

@ -247,6 +247,7 @@ if [ "$action" == checkout ]; then
if [ -z "$UTOOLS_VCS_OFFLINE" ]; then if [ -z "$UTOOLS_VCS_OFFLINE" ]; then
git_track_branch "$release" "$origin" git_track_branch "$release" "$origin"
fi fi
git_fast_forward "$release" "" "$origin"
exit 0 exit 0
fi fi
@ -273,6 +274,10 @@ Vous allez créer la nouvelle branche de release ${COULEUR_VERTE}$release${COULE
fi fi
fi fi
fi fi
if [ "$r" -eq 0 ]; then
# éventuellement fast-forwarder automatiquement
git_fast_forward "$release" "" "$origin"
fi
if [ "$r" -eq 0 -a -n "$merge" ]; then if [ "$r" -eq 0 -a -n "$merge" ]; then
set -- "$release" set -- "$release"