sda-php/nulib
Archived
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
Jephté Clain 2025-02-28 10:50:59 +04:00
parent 0b403ee582
commit 1ddb6f80b8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bash/src/pman.sh
View File

@ -318,7 +318,7 @@ function _mscript_delete_branch() {
_scripta "delete branch $SrcBranch" <<EOF _scripta "delete branch $SrcBranch" <<EOF
$comment$(qvals git branch -D "$SrcBranch")$or_die $comment$(qvals git branch -D "$SrcBranch")$or_die
EOF EOF
array_addu push_branches ":$SrcBranch" array_addu delete_branches ":$SrcBranch"
} }
################################################################################ ################################################################################

8
bin/pdev
View File

@ -32,7 +32,7 @@ Ce script va
ask_yesno "Voulez-vous continuer?" O || die ask_yesno "Voulez-vous continuer?" O || die
local script=".git/rel-merge.sh" local script=".git/rel-merge.sh"
local -a push_branches local -a push_branches delete_branches
local comment= local comment=
local or_die=" || exit 1" local or_die=" || exit 1"
@ -66,6 +66,12 @@ if [ -n "\$push" ]; then
esection "Pousser les branches" esection "Pousser les branches"
EOF EOF
_script_push_branches _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 _scripta <<EOF
fi fi
EOF EOF