bug
This commit is contained in:
parent
0b403ee582
commit
1ddb6f80b8
@ -318,7 +318,7 @@ function _mscript_delete_branch() {
|
||||
_scripta "delete branch $SrcBranch" <<EOF
|
||||
$comment$(qvals git branch -D "$SrcBranch")$or_die
|
||||
EOF
|
||||
array_addu push_branches ":$SrcBranch"
|
||||
array_addu delete_branches ":$SrcBranch"
|
||||
}
|
||||
|
||||
################################################################################
|
||||
|
8
bin/pdev
8
bin/pdev
@ -32,7 +32,7 @@ Ce script va
|
||||
ask_yesno "Voulez-vous continuer?" O || die
|
||||
|
||||
local script=".git/rel-merge.sh"
|
||||
local -a push_branches
|
||||
local -a push_branches delete_branches
|
||||
local comment=
|
||||
local or_die=" || exit 1"
|
||||
|
||||
@ -66,6 +66,12 @@ if [ -n "\$push" ]; then
|
||||
esection "Pousser les branches"
|
||||
EOF
|
||||
_script_push_branches
|
||||
if [ ${#delete_branches[*]} -gt 0 ]; then
|
||||
_scripta <<<"if [ -n \"\$delete\" ]; then"
|
||||
push_branches=("${delete_branches[@]}")
|
||||
_script_push_branches
|
||||
_scripta <<<fi
|
||||
fi
|
||||
_scripta <<EOF
|
||||
fi
|
||||
EOF
|
||||
|
Reference in New Issue
Block a user